Thanks, kudos1uk.
I was just in the process of making up a step-by-step procedure and got a bit stuck with the order on how to attach the new stuff.
Two questions:
1) Removing and attaching the whole unit as one will require moving the pipes by a good few cm, perhaps 4 or 5? Is there usually enough play with the pipes to manipulate them that much?
2) Why wouldn't you replace the olives? Is it because they are so difficult to remove that the gain is likely not worth the effort?
I have ordered (all from amazon) pump, 2 valves, 2 rubber washers, olive removal tool and PTFE tape, total cost £88. I should have it all by end of week.