Just an update on the wheel build as it might affect other members in the future. I have just taken hubs and borrani style alloy wheels from ebay piicambi10 to Southport Wheelbuilers (
http://wheelbuilders.blogspot.co.uk/). Great guy - Alan Atkinson - ex Bill Head & Bill Head mechanic from 70's. He advised that the angle of the spoke holes in the rims are for a small hub with a disc brake if you want to keep the original spoke angle/pattern. So, front is ok but as per Marks input earlier in this thread, the spoke angle can be changed but the spoke angle on the original wheels are designed to counter the acceleration and braking forces so the shallow angle/shorter spoke isn't ideal but will probably have little impact in reality.
Just thought info might be useful.
While I was there, I took the front wheel from my K2