I think you are heading the right direction. Several years ago I had a Nissan Titon and was in the market for a toy hauler. I bought what I figured was the max weight the Titan was rated to tow. I bought a 23' Weekend Warrior. Today I drive a Silverado 2500 DuraMax. The Titon would pull the Warrior but not easily. Ever little incline would make me have to downshift. I couldn't use the cruse control because as soon as I hit the slightest grade the trans. temp would start climbing. Now that I have the DuraMax I wish I had more toy hauler.
In a nutshell don't try to by the max trailer your truck is rated for, you won't enjoy getting there or getting back.