I've rebuilt mine by now, and am about to sell for 10K. Has a good rebuilt 7M-GTE now and a good CT-26.
If you can sell the 7M-GTE and W58 for a decent price, the body and interior on mine is very good, so it may be worth buying for your conversion.
I could consider throwing in a substanmtial amount of spares.
Burgundy 1986.5 NA with 7M-GTE conversion, Tokico Illimina II TEMS suspension etc etc. $10K. I've owned for 11+ years.
Just a thought.
Michael