If you are interested in an integrated solution for your Heritage setup, Aavik has amazing synergy with Danish loudspeakers. They are not cheap but sound amazing.
I am in the process of upgrading all of my Dynaudios to either Børresen or Raidho and am going to be pairing them with an Aavik setup. (I am only upgrading due to not being able to source the Evidence Masters).
Also, your Heritage sound much better than my Contours. I actually thought about doing the Heritage route, but my room is fairly large.
I am envious of your Heritage setup - Enjoy whichever path you choose.