Burl, thanks to your ideas, we are not selling the 213. My wife liked the idea of changing the dinette, and if that doesn't do it all, we will then rebuild the sofa area.
My water tank is rectangular and in cross wise position. Tho' I have not measured it, I know I can come up with a decent amount of space just by changing it to longitudinal. There will be plenty of room to relocate the pump and electricals as well.
I'm thinking of changing the dinette to a couch that will easily become a bed, and perhaps changing the table to a free standing on those vertical posts.
While I'm at it, I want to replace the ugly shag carpet in the coach area as well.
Keep that thinking cap on!!;)