Mine was out for 5 and a half years. Main dealer fitted it. All that time it had problems cutting out at low revs when under load and the when starting from cold. Also the tick over was really lumpy. All these problems stopped when birchdown changed mine. It was ok at high engine speeds though and the power and economy seemed fine.
Was the timing out by a lot? You deserve a medal for putting up with that for so long lol
Beef-Mc, might be worth getting the timing checked but as post number 3 said could also be just the lambda sensor. The symptoms youve listed all relate to that too.