Upgrade modded P25 to P7 or uprade cartridge

I'm looking down the road and wondering where I might get the best bang-for-buck upgrade on my vinyl rig.

My current source is a Rega P25 with Groovetracer subplatter, Michell Tecnoweight, Funk Firm Achromat, and VTAF. I'm dangling a Dynavector 10x5.

Given the modifications I've installed on my P25, I'm wondering how much I might benefit from moving up the line to a P7. Obviously, the P7 has an upgraded platter, improved tonearm, and also the TT-PSU. If I went this route, I would keep my 10x5.

Another option is to keep my P25 and upgrade my cartridge by moving up the Dynavector line to, say, a DV-20x.

I guess it all depends on how close my P25 modifications bring my deck to the P7.

Any input or advice is appreciated.

(Associated equipment: SAC Gamma phono pre (MM/MC), Earmax headphone amp, Sennheiser HD-600s.)