Next step?

I am looking for recommendations for improvements to my vinyl front end. I listen to different varieties of music, but mainly rock and jazz. I want my analog front end to rival my digital front end.

My current analog setup is a 90's vintage Systemdek I 960. This is sort of a rega planar 3 clone having a Moth 300 arm but a acrylic platter/subplatter and larger MDF plinth. I am currently using a Dynavector 10x5 cartridge but also have a Linn Adikt. I have re-wired the tonearm with Cardas wire and use a Kimber Tak H cable. I have added Michell tonearm weights and the Riggle VTA adjuster as well as the Herbie audio TT mat.

I have a PS Audio GCPH (Underwood hifi mod) as a phono pre. I use the balanced outs to a Pass XP10 pre and XA 30.5 amp. Speakers are Legacy Focus SE. My digital front end is Linn Akurate DS. I stream flac/wav files from a NAS.

I think I've basically tweaked out my current setup more than any reasonable man should. I was wondering if a new cartridge or a new TT would be the best next step (or both?) and if so how far do I need to go. For example, would a VPI Classic 3 be more of an upgrade than going to a Dynavector 20X2? Or would a Classic 1 or Rega RP6/8 be a significant upgrade? VPI Traveller? Well Tempered? Clearaudio?

I have been ripping vinyl using a HRT Linestreamer which is fantastic. This way I can buy vinyl and listen to it through the TT or stream it from the ripped file depending on the situation.

Thanks in advance for any advice.