S, the sort of stuff tents come in or waterproof jackets are made from make good dams to protect the PCB/instruments. Nice and flexible and easy to push into shape as you refit the dash. Use sticky backed velcro to attach at the top edge.

Does the odd bulb push int one of the instruments?

Best to replace all that tubing and connectors for the screen washer system. look at car builder solutions, All in there!