The bike chap said the bike sounded 'very rough'. If that's the case, then the replacement petrol cap I bought didn't do the trick. That means that I wasted the money on the petrol cap. Plus the tank is still letting in water. Gutted.
I now think it could be to do with the angle the bike leans over on its side stand. To test this theory, I will leave the bike on its centre stand.