Recommended cartridge under $2k for a Yamaha PX2 tangential turntable

I am looking to spend up to $2,000 to upgrade my analog source.  My turntable set up includes a Yamaha PX2 tangential turntable with a Hana EH MM cartridge and an Eastern Minimax phono stage.  I also have a Denon  DL-103R.   The  front end consists of SST Ampzilla 2000 SE monoblocks, SST Thoebe II preamp driving Acoustat 2+2 electrostat speakers.   I listen mainly to jazz, jazzy rock, and R & B.

My question is given the quality level of the turntable and phono stage, does it make sense to spend the $1,500 - $2,000 to upgrade the cartridge and live with whatever constraints the table and phono stage present, or should some money be applied to upgrading the table or phono stage?  Or should I spend less on a cartridge now and look in the future to upgrade the table?  I very much like the convenience of having an auto return function on the table, having had pure manual tables in the past and to some extent am willing to sacrifice some quality for this convenience.

If the answer is focus on a better cartridge, which cartridges would be a good match for the Yamaha table?  I would like the cartridge to present a dynamic and 3D soundstage without silibance.  Sure, only another $5k and I've got it, I'm sure.  I am not opposed to buying a pre-owned cartridge, hopefully one that can be rebuilt down the road.  I don't have any preference as far as cartridge type or brand in that I have very limited experience and simply haven't heard the next level or 2  in quality of cartridges.

I am currently adding digital front end (DAC and server) so I can take advantage of Qobuz and/or other services), which is my other goal.  I  appreciate whatever advice you can give.  Thanks in advance.