Update on the tire rim tape.
Went to Bunneys at lunch to find the bike had popped the new tubes fitted while they were testing them (sorry!). It turns out the spokes have studs which aren't counter sunk in anyway and stick out a country mile!!! Going back later as they are fitting heavy duty plastic tape (which is coming from a lot larger diameter wheel size).
Design flaw?