After couple of laborious days of planing-sanding-planing-sanding-swearing-sanding-planing-sweating-sanding-swearing-planing-sanding i finally managed to produce snugly fitting top and heel for the mast: