Only other advise I can offer rob, is the trailer tires. I don't know what brand came on your rig, but I can say with some degree of certainty, a 28' dual axle toyhauler is going to need a premium tire.
Two ways to look at it, bite the bullet now and put what you have on craigslist while they are still new to recoupe some money.
Or run what you have for a couple years then make the switch. With white knuckle sway involved, I would opt for option one.
The bridgestone duravis R250 and Michelin xps rib are the tires I would consider. Expensive yes but they will serve you well for atleast 6 yrs so it works out in the end. I have run several sets of both and they are as tough as they come.
Food for thought :) Hope you get things worked out, looks like a beautiful rig. BB
