Just given the bike a clean, removed all the grubby marks the dealer missed, and the bug population of the Cotswolds! The chain had flicked grease EVERYWHERE, so I used "just the tonic" and it cut through the the grease really easily. I won't dread the next wash quite so much!
Rim tape goes on tomorrow night.