I would say the 996 engine is the better engine too, the new 998/999 Testastrata engine is the result of ever tightning EU emissions laws.
The 996 engine has a longer stroke and IMHO, it sounds better.
Either way, you`ve got a Fantastic bike, Enjoy the summer....