my vote would be to stay 2 valve also, but I'd consider getting a used Multistrada as they are coming up dead cheap because people want to get the new Multi....it has everything your old S2R1K has and the ability to be comfortable for those 8+ hour rides as well as commuter/city agility.
+1
I'll likley have a '03 MS1000 for sale that'll be at the sub $7K mark.
