Plans for my VPI Prime Scout

My existing TT is a slightly modified VPI Prime Scout: Scout base; Classic Signature feet; 12”, 20# Prime platter, JMW-9 Gimbal Tonearm, 300 RPM motor in Aluminum enclosure and two speed pulley; periphery ring; HR-X center weight. The cartridge is Soundsmith Zephyr Star MIMC. It’s quite old, and I’m not sure of the hours, but it has no obvious issue.

Here is my plan for an upgrade. I would appreciate hearing your opinion on what I’m thinking.

I contacted VPI they priced some upgrades, gave me a trade-in price and suggested the Signature 21 if I wanted to go with a new table. The Sig 21 is $6,700 after trade in.

The current plan is to modify as below:

Scout Base: Keep

Classic Signature Feet: Change to HW-40 ($0.00 - dealer “owe’s me one”)
Prime Platter: Keep

Tonearm: Change to 10” FatBoy Gimbal with Nordost wire (Possibly change wire to AQ Angel to match interconnect).
Motor: VPI said the single speed pulley and multiple belts is usually only run with a speed controller. So my plan is to keep the same and Keeping same and consider the SOTA Total Eclipse package.

Cartridge: Hana Umami Blue has been suggested.  I read great things and was wondering what else I might consider.  I listen to a pretty even mix of Blues, Female vocals, R&B, Classic Rock, and Jazz.  Side question: Is it better to sell the Zephyr before or after it's retipped?

If I go with the above without the Total Eclipse I pay 45% of the Sig 21 full cost. With the Total Eclipse it’s 62% of the full cost.

The other option is to sell what I have now with the new feet (presumably above the $2,000 trade-in), and buy ……what?

Thanks, I appreciate the help.
Jetson