Get a proper DAC, but maybe one with a good digital volume control you could get rid of your pre as well.
Once I got my first DAC with a built-in volume control (exasound) I sold my Mcintosh c-38, as the DAC was more neutral. It took a while to get used to it, but once I decided I didn't like the colouring of what the pre did in my system there was no going back. I believe the volume control in my Weiss DAC is better than the exasound was. It has a decent streamer as well.