Front/Rear washer pump wiring.

I'm in the process of trying to get my golf back on the road after switching to ITB's. How ever, I am hopeless with wiring, need to learn at some point.

Anyway, I'm moving the windscreen washer bottle to the boot and then running the tube, with inline valve to the front. I don't have a rear washer so the wiring for that is currently redundant. As I see it I will switch the front wire for the rear wire at the fuse box (CE1) to get it working by pulling the stalk for the front wash.

1. Am I right to think that if I swap pin C9 with pin E7, pulling the stalk to operate front wash would then operate the rear?
2. Any recommendations for good terminal removal tools?

Cheers