Oil contamination on the eccentric shaft sensor should have been the first thing they checked rather than the last. It was mentioned quite early on. Good to hear you are back in the road though.
Told I need mine replacing by my mechanic and said to see if I can locate one cheaper than he could get. Any links to where to get one would be appreciated.