Quick update, removed egr valve and cleaned it, was quite dirty but not stuck open at all. refitted but made no difference to 'lumpy idle'
Disconnected MAF but this made no difference, possibly made idle worse.
Added a dose of Millers Eco Max to the tank of Esso diesel put in last night and...