You sound like a prime candidate for an HSI upgrade. If you're looking at needing to replace a CDI and a DG, then why not? It'll give you a nicer panel that is more functional for IFR.
About 90% of my time is in planes with HSIs. There's a reason why all the big guys have them - they're better. It makes approaches simpler, and it is a more logical layout than having a CDI and a DG separate.
There are a lot of different options out there. The Aztec has a Century unit in it similar to the one that Ron linked to, although electric. I've been very happy with its performance. In the 310 we recently upgraded the defunct Collins units (so old the avionics shop said that they hadn't seen units like that since dinosaurs roamed the earth) to an Aspen EFD1000Pro. I would definitely recommend that if the budget will allow, although the unit itself is $10,000 plus install. But any HSI will be a big improvement.