ESP32 Heating Controller Hardware Revamp

Existing incomplete design for an esp32 based heating control board. Needs several schematic and layout changes (KiCAD).
-Add encapsulated mains PSU
-Board supplies no longer derived from 24V external supply
-Add interface for RESOL vbus to UART (working schematic provided)
-Add 4no Pump PWM signal drivers (Working schematic provided)
-Add SPI or i2c oled display
-Remove RasPi footprint
-Mains input protection (MOV)
-Relay output protection (MOV)

Existing project attached.

AI automated proposals will be ignored, please demonstrate that you have at least opened and reviewed the project files in your proposal.