Parts arrived this week and I've put the input/output back together.
I noticed a major design discrepancy between the manual I have, the exploded view the dealer worked off to order parts and the ACTUAL shaft design fitted to my bike....
Pre- roadster manual shows a circlip, thrust washer then output 3rd&4th (#17 & #18 for anyone with a manual) gears on splined bushes then thrustwasher , circlip. Clearly the circlips retain the 2 gears and everyone is happy. My dealer ordered these exact parts according to the updated Roadster workshop manual which shows the same parts in the same order. However...
The thrust washers do not fit in the space between the circlip grooves on the output shaft fitted to my bike. Instead of splined bushes that fit flush with either face of the gears, mine has bushes that have a "washer" at one end ... I assume this acts as the thrust washer as it is this face the seats against the circlip either side of the gears. So the extra width of the bushes means you can't fit thrust washers as well because they won't fit between the circlip grooves.
My concern is that both manuals show very clearly circlip-washer-bush-bush-washer-circlip and there is no way that this is the set up on the output shaft fitted to my roadster.