Andy--  did you get your bike sorted in the end??    I'm interested as I've just today dropped my 996 into Pro Twins to have Rob look over the suspension -- I'm having exactly the same issues as you've (and all) have described. Rob prescribed new front springs (Hyperpro.. surprise!) and a new rear spring... 
 
 I've heard differing opinions on the HP's, so a little hesitant now, but then again I'm dont think I'm experiened enough to know any different!  
 
 But I'd appreciate any feedback on your results!
 
 J--