Sweet deal! Hopefully my fix for my e21 will be as straight-forward (similar design). One thing to note... FUEL FILTER. It sounds like this may not have caused pump failure for you, but it can if the filter is clogged any and causing stress on the pump. May as well replace the filter (cheap), esp if you dont know when it was last replaced. I think the recommendation is new fuel filter w/ spark plug change?