Ha ha, I bet it does! too many pumps and filters and pumps and filters etc for me. JM says the Beemers petrol engine is pretty bullet proof (if anything like my Passat, then will be happy) - and with what I have read, that's good nuf for me.
Will, I hope you get it sorted or get shot of it...