rob, that sounds a lot easier than the corse wheels I was looking at.
The factory 3 spoke mag jobs needed more doing for the front and rear to fit.
Maybe the later 5 spoke flavour are more of a retro fit.

It is different spindle size,25mm no good to me unless I can find a matching front tho:(

forget the wheels mate, spend the money on a nice sexy carbon tank , or ohlins front suspenders.;););)