@Flams000
If you’re considering upgrade everything, you should consider active speakers like KEF wireless or B&W Formation Or even Kii 3 (expensive).
You will in the end probably spend more money on new DAC, amps, endpoint cables, power supplies etc., and you’re into an endless loop of upgrades 