I'd worry about dropping below 1600. Honestly, I'd say that if you aren't seeing 1700 psi consistently at WOT, it's time to start thinking about a new pump. I'm currently on my 3rd failed pump.
I'd go with either the KMD internals or the Autotechs. That's going to be your best option. IMO, the CP-E pump is a rip off. The other thing that you've got to consider with them is their core charge. With the core charge + shipping, you're looking at a charge of $1000+. It's also up to them if they're going to refund you for your core. If they deem your core not worthy, they can decide that they don't want to refund you.
As far as fuel rail... There's no way in hell that we need a new fuel rail. The only thing that we need currently is an upgraded relief valve. On MSF, there's a bunch of us who have a failed relief valve, and it's causing all sorts of havoc. We've got a member who made an upgraded one, but it's not been tested and verified yet. I'm replacing mine with a stock one as a bandaid. It's a sucky solution, but it's what we've gotta do for now.
The other important thing for upping the fuel pressure is the fuel pressure sensor. We should be seeing new tables in the next release of ATR for scaling the fuel pressure, so that should give us mostly what we need for fuel related items.
The other two things that no one is sure about yet are injectors and the in tank pump. I think the in tank pump should be fine for quite a while, but we'll see. I'm pretty close to maxing the injectors out, so I need to start thinking about how to get upgraded injectors.
Anyway, I'm rambling off topic.
Get Autotech or KMD would be my suggestion