I hope you were able to find the right coolant pipe. I'm sorry I've no idea if there are different versions, I'm waiting with mine until the next timing belt change and do the water pump too.
I'm hoping that makes replacing the pipe easier, sounds like a awkward job with everything in place.
I like your proposals for personal transport, I do love a big Citroën. But I don't think I'm brave enough to own another now. Since getting the Panda I think I'm slowly going off big complicated cars
I think my ideal garage would be:
-Bicycle / ebike for local trips with small trailer for shopping
-Electric microcar / quadricycle for slightly longer trips. 90kph and 100km range would be useful and not need masses of batteries. Current favourite is Microlino, also like the Silence S04 with its removable batteries that double as power banks. But I'd prefer a 2CEV or Austin 7 / Morris 8 converted to electric.
-Classic sports car for occasional long journeys and touring holidays. Healey 100 fits the bill