Is it worth upgrading my current turntable setup?

As @pindac says:

Make a few contacts to see if visits can be arranged to those in possession of devices you have shortlisted and make inroads to see if you able to be offered demonstrations of items.

Take along your newly cleaned LP’s and if there is something new to pick up on and a good impression is being made, usually the improvement on offer will be noticed instantaneously.

The ears are the very best tool for such investigations.

This method of gathering experiences does not require too much of an outlay either.

+1

If it is good now, then you really don’t want to be risking wasting funds on something that is the same, or lower, performance.

I also run a 2M Black, and a couple years ago went from an old Technics 1200 to a JVC Victor TT-81 with a JVC Victor UA-7082 in the big JVC plinth. While the turntable and arm made a noticeable improvement, upgrading my phono preamp to an E.A.T. E-Glo Petit made an even bigger difference. I haven't heard your Tokyo Sound, but I'm guessing you could do considerably better.

I’d grab either the music hall mmf-5.3 or 7.3...they both can be had with a 2m Bronze already mounted. Then, take off the stylus from the black and put it on the Bronze, both cartridges are compatible. Then, put your 2m black in a drawer as an extra...both music halls will sound better than the Pioneer. 

After a couple of bouts with upgraditis, I did not hear problems from my system - not harsh at the treble, not muddy at the bass, just no complaints. Therefore, I reasoned, the components are compatible and the result is good. Yes, I could have gone places to listen to a higher level to which I might aspire. But why? I didn't hear a problem that needed solving. No more upgraditis.