I'm thinking about the Tremol-no as well. I will ask the luthier's advice about it.
Incidentally, the plot thickens. PRS support got back to me (love that guy, Matt is the BEST) and they have a record of the guitar going in to the tech center to get the switch pots and a pickup swap. The "mess" is not their work, it's the work that was done to UNDO the work done by PRS. Some sloppy cuts and resoldering to bring the wiring back to stock.
That makes it nicer, as the pots are likely correct values and tapers, and having switching pots won't hurt me a bit - I can use them or not. From the outside the guitar looks stock except for black pickup rings, which I prefer to the cream.
So now I need to figure out what pups are in there. Looks like one stock (based on the shielded wire) and one not, I'm thinking they added a 4-wire neck pup. But I didn't take more than a few seconds to check it out. Tonight I will have time to open it all up and see what the heck I have in there.
I had already been considering swapping the bridge just to get the square-bobbin look, which I like. If the neck is not stock, I'll get one of those as well. If they're actually stock, I'll likely leave them for now.