Have 10mm cable installed for 9.5k shower.Cu is currently full with 6 cartridge fuses.Have a shower consumer unit with mcb-rcd protection.Intending pulling the water heater outlet and using for shower cu connection with suitable plug in mcb and adding extra mcb in shower cu(room for one more)for water heater.Sound like best route ??