Well I swapped out the oxygen sensor today as I got hold of a spare just to eliminate that as potential cause of the issue.

Took her for a drive and all went very smoothly until after about 40km all through the hills I got down to the plains and it started again although not as bad as the last time, still very annoying.