[Lee B]

I was in the same predicament a few months ago, ended up buying the 998R

You say that you once owned a 998R, so you must be spoilt then having all the trick bits that come as standard and the bike having that 'special' feel.