Thanks for that Nige, unfortunately the main circuit is already in 22mm but I haven't put the spurs in yet so they can be in 22 now, although I will have to reduce down to 16 to connect to the rads as the fitting options are not that good here.
As for the heat sink I will do that now, but I...