Depending on your intended use, I would suggest doing the minimum needed to make the trailer useable, even if it means foregoing a few luxuries and conveniences for now.
Initially, my wife and I cleaned up our 66 and used the bathroom only as a place to put a porta potty to give us a chance to camp semi locally on some short trips. In doing so, we found a number of things we thought we wanted to change to actually work well for us. Conversely, the used gaucho we picked up seemed less than ideal and was removed over the winter to make room for 2 recliners.
Our experience prior only included smaller scale camping ( backpacking, small tent, 13' SOB ) and did not prepare us for what would work best for us in a trailer the size of the Tradewind.
Whatever you decide, make sure you address function before form. Glad to hear you are sticking with the factory layout. You avoid many pitfalls in doing so.
Best of luck!
Lou Axt, Jr.
1969 Chevy C10