Killer guitars! Man, do I love the looks of that Navarro.
I think you need to reevaluate your opinion on the SE trem though.
The main reason I picked up my first PRS in 1993 was because I was sick of double locking trems and allen wrenches, and I'm a whammy bar addicted knucklehead that can't keep his hand off the bar (I'm working on it.).
I own a limited edition John Mann 1980 spec, an original MilCom, an Excel made two-piece, and the SE trem. It's not a bad unit. You just need to look at it with those same eyes that lead you to believe the SE guitars are a good value... with a little modification.

I don't feel that it's as much of a tonal or functional step down, but more of a quality of material kind of step down.
You
can put a core arm in an SE. I already did it. The little bushing that holds the arm is too small, which is a good thing 'cause that leaves you with material to ream it out and jam a core arm down in there. You could use a drill or you could be like me and sit there with a cigarette lighter lit on the end of the bar and massage that hot beauty into the bushing, melting it. Didn't take much either.
My biggest beef with the SE trem, and the reason for the whole "playing with fire" episode is because the bar is a little too long, with a conical shape on the end that makes it sit up higher in the block. You can always shave that down a bit too.
Saddles are easy enough to change, and those can also be a preference thing as well. The only guitar I have the stock saddles on is one of my SE models and that may change soon, I have a spare set of core saddles laying around that I might give a whirl...
There are a ton of things about the S2 construction and cost saving measures that we'll never know. But as I mentioned to you in a different thread about you not feeling the SE trem was a good enough on your $**** guitar, there is a
$225 price difference of the units.