blimey, you've been busy there.
Hope I've done the right thing getting an OEM pump, Rimmers had 3, a really cheap aftermarket, an OEM and an original...... went for the OEM.
Not looking forward to it too much, some people have a nightmare doing it, others get it done in no time, we shall...