I always consider the govt. accounting simple voodoo. The SPSPA and LP are, as we know, not considering the underlying economics of the prior transactions; after all this is what accounting is supposed to be doing.
The number is $187 or $188B for the value. They started adding to it with the LP.
All they need to do - and will do as you believe - is convert the SPSPA to common / warrants and then they will have a new total. A book entry, right?
This would leave a lot of value in the common / warrants and the only question would be what is that value?
No sense in prognosticating what Mnuchin, Phillips, MS, JPM came up with - unless you've seen the roadshow they presented and unless their roadshow was to sell only new JPS, one can surmise they were selling common stock.
Moelis and Blackrock plans would have them converting the warrants, and I do believe this is in the cards, but how they aportion their total is anyone's guess.