The one thing that got me thinking and has not been improved is that the socket outlet for a small under counter geyser would need to be on it's own circuit , which is really bizarre on a element that is less than a KW

People still conveniently confuse the terminology of dedicated circuit to mean without ELU when it is actually referring to a circuit for water heater only
ELU will need to be fitted for hot water heater

6.16.2.2 Dedicated circuits shall be provided for water heaters and there may
be more than one water heater on each circuit. Where a socket-outlet is used,
it shall be unswitched

6.16.2.1 All water heaters shall be bonded in accordance with 6.13 and a.c.
supply circuits shall be protected by earth leakage protection with IΔn not
exceeding 30 mA.