I've been in your shoes.....if it was me I'd do the body shop thing. Paying for storage space is throwing money down the toilet. At least you'd be getting something for your hard-earned cash. If I had a previous mis-communication with my body guy, I'd set out very specific expectations in writing as to what would be done, for what price, and completed by when. Good fences make good neighbors, and all that...
Sounds like you're on the best track available at the moment. Things will improve greatly with your own place and own shop.