Fitted the new tensioner, and a longer belt 6PK938, it might be a little long but is within spec. The belt passes the tensioner at just under 90 degrees, so there is a lot of room for movement now. It also means replacing the belt will be easier. If a 930 long belt was available tha would be the ideal size.
Had to replace the fuse for the air horn, put in a 15A and that is now working.
Body filled in some of the fine pin holes on the wheel arches, a little more wet and dry sanding, and these will be ready for gel coat