Some more cleaning and fettling.
Replaced the broken bonnet release catch lever in the footwell.
Water trickling into the spare wheel well from the back somewhere so need to do the flange / seal / re-work and see how it proceeds. At least with the bung out it will just drain straight through. Will also have to trawl and see if the rear washer hose has broken / split and is part of the problem, since that doesn't wash.
Replaced the accumulator this morning, that has sorted the warning lights on starting to brake issue and stopped the pump running so much, but obviously takes quite a lot of fluid as then got low brake fluid warning bing / message on test drive.
Driving much better than it was, just need to order the EAS compressor overhaul kit and at some point do the full compressor / solenoid block overhaul to quieten that side down.
Did some electrical tests - looks like I might need to replace the main earth / alternator cables as quite a volt drop on them.