Ended up "pulling the trigger" on a P07 today. Ended up at $442 total, which isn't bad for the Gen2 (non-Duty) model from what I can find.
Now, I need to decide what to do with the $250 from the PT111 when I get it. I'm either going to save up for a Shield, or buy holsters, grips, mags, etc for my CZs. Decisions, Decisions...