Your idea of workout equipment is what I have set up in the shop. The ceilings are quite high, 9 feet+, so the pullup bar and straps are easily out of the way while open... but gives me plenty of opportunity during other times. Although I'm sure that you have put alot of thought into this, there are lots of flexibililty/mobility movements you could do with the straps... perhaps it might help your shoulder?

Good luck in your move; sounds like you might just have teh perfect place to work out!