white smoke is usually unburnt diesel being expelled, now because diesel requires high compression to make it burn it does sound as though a set of rings and a de glaze of the bores are in order, whilst you have the head off remove the valves and re seat them, just has similair myself but it...