hhmmm sounds good that mate and better than buying a too common 1098. But i think its a sensible idea instead of chopping yours in for a complete 996 seeing as you already know so much about your bike.

Good luck hope to see it someday