The only thing I can think of is, have you considered making a run on Craigslist to sell your current trailer? This is a popular time and there are a lot of people buying. Dealer trades are usually very low compared to what you can get selling private party.
The whole PDI thing is a bit overblown IMO. If/when you find little things with fit/finish wrong it usually results in some 20 year old kid grabbing a mallet or a saw and fixing it. No thanks.... I'll take care of it myself. Of course, mechanically things should work but keep in mind you have a warranty as well. I've bought two new trailers in the last 5 years and was shocked at how little the person doing the "teaching" knew.
The numbers working and you being happy are the most important things.
