@jsqt I like your choices of both your current gear and the items you mention aspiring to. But IMHO, the premise behind tuning to your preferred genre is not a long term satisfying path. You might evolve and expand your musical taste. The gear you have and the gear you seek should work well with all genres. Many disagree, that's fine.
I know many enthusiasts who rely on tonearms with removable headshells and vary cartridges for genres...that's one to do it without radical changes.
Instead, I prefer to go with the best all around performers I can afford and lean towards natural timbre, transparency and good dynamics. If those attributes are right, it works with all genres.
If it helps, I have a Sota Nova and previously a Technics SP10mk2.
Cheers,
Spencer