Hi mathew,
I have also been in the same position, although I was running a BP.
Did all possible cost & performance gains.
Answer, sold my BP for 5k, and bought a really nice low milage 916SPS for 6k.
All the SPS goodies, and allready running the 996cc lump, no need to start mucking around with boring out etc.
Got a race bike with lights, and goes like greased lightning, and those termi's sound fantastic.
Might be a better option mate.
cheers
robin