If you can afford to make the change the Bunk House would seem to be a logical option for you. We camped with 2 children in a pop up for a few years and they really did not like the dinette option because we wanted to eat breakfast when they just wanted to laze around. I think he needs his own space about now.
This website is not affiliated with or endorsed by the Airstream, Inc. or any of its affiliates. Airstream is a registered trademark of Airstream Inc. All rights reserved. Airstream trademark used under license to Social Knowledge LLC.