I'd consider building 2 buildings. One to work out of and the other for storage. I'd also use the 21 footers and buy a few more 21's to make a longer workshop. Wouldn't take many more for a decent shop and when it was done you'd have a great storage building as well. Of course you'd need a lot large enough for this idea.
After my post I see the second page. Good question, what happened?