The upgrading time is enormous especially with the release of the X1 upgrade.
The upgrading time is about the same as to build a ship ( A ship always need a little refit too).
It would be time to add Ship generic upgrade tokens to the Fm.
Just like ship build tokens the ship upgrade tokens could be in FM chests with the same payout.
Kixeye said the build time for ships would go down and it went down a little but then they more than double it when they released the "Upgrades U1, U2, U3 AND X1"