Storage or Body Shop

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.

I'll give you some quotes he's said that might make some run away from this body man. "I don't want to do anything for under $1000." He also did a materials charge when he started my sons firebird, things like sanding wheels etc. I think it was around $400. Some said at the time he should have had all that stuff, I'm on the fence of that idea because it would be rolled up in the cost of work anyway.
So the setting of written expectations and prices for section by section work is a must along with a time expectation. I guess if he wants money up front we won't have a deal, don't want the car held for ransom. I did read a good thread on this written on FABO a few years ago, some good guidelines in there as well.