Is it worth upgrading my current turntable setup?

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.

No, the Pioneer PLX 1000 sounds as good and capable as any TT under $2000! I have one with a Denon 103R mc cartridge. Read Herb Reichert's review in Stereophile (gramophone dreams #4). If you seek a different sonic "flavor" then buy a new cartridge: Hana SL mc ($750) or a Soundmith Carmen mi ($799). Also changing the mat will result in a new sonic "flavor" for not much money! You may want to try a record weight - I use an Audio Technica.