It occurs to me that one of those Self-Erecting Pop Up Tents might be a good idea, we have several tents that work perfectly well, but I hate messing with those bendy fiberglass tent poles. How about something like this:
http://camptents.com/SpecPages/PopUpTents/PinnaclePopUpTents/PinnaclePopUpTentXP3033-2.htmThere are also three and four person versions. If you watch the video on the spec page, it does look a little awkward to put away.