Sounds good! Do you know what the contamination was? My old ducati used to let rain into the tank, but it still ran ok, if a little down on power.
Three Cross are pretty good - borrowed a Bobber and a Street Cup from them. Second time I did the Poole/Bournemouth DGR they opened up early on Sunday so a few of us could meet there and ride in together.