I would suggest upgrading just one component at a time... See if you like the DAC, before changing pre and amp...

Also, you could just get a DAC/Pre like the Benchmark HDR, Wyred4Sound DAC 2 or Bel Canto 1.5 / 2.5 or even an integrated amp/DAC like the Bel Cantp C5i...