Need advice on upgrade path

I have been set on an unexpected need to upgrade after an unfortunate feline induced short circuit. Apparently my cat took offense to my Plinius 8200 and used it instead of the litter box. lucky the house didn't burn down!
My remaining system is: 

• Technics SL 1700 w/ Nagaoka MP110 and Cambidge Audio 640p phono preamp.
•  Bluesound Node 2i and Schiit Modi mulitbit dac, 
• NAD 2100 amp
• Vandersteen 3A speakers and SVS SB 1000 subwoofer.

 I mostly listen to streaming digital with Spotify and Tidal hi fi and the rest to LPs. I think I would like to go the separate route. Have been considering: Schiit Freya+ preamp and Schiit Vidar amp, or Conrad Johnson PV 10A preamp and CJ MF2275 amp. Can anyone help with this choice of new vs vintage equipment in terms of sound quality and reliability? Also, are there better options to consider for the preamp and amp new or used that outperform my choices and have better synergy with my speakers? Are my amp choices powerful enough to properly drive my speakers? And before you all say it, I am keeping my eye out for an upgrade to 3A sigs.