If you decide on upgrading the preamp, look into Backert Labs. The Rhythm 1.4 is in your price range and it is fantastic.
if you decide to upgrade DAC, I have a Lampizator. I just demoed 4 other DACs and have decided to stay with and upgrade to another Lampi. But if I did t want a vol control, I would be choosing the Aqua La Scala DAC that was so engaging.
But also, the idea of splitting your budget into both pre and DAC could still lead to an upgrade in sonic performance.