Sorted eventually, to anyone doing a loom swap BEWARE - the colours on the speedo plug are NOT the same on the 04 model as the previous years, found this out with Nath's wiring above, had to source an earlier plug layout to rectify 2 missplaced wires. But the good news is it works a treat. So...