Electrician 1 sounds about right but the consumer probably does need an upgrade, I think you can get rcbos for that and I think they are type A, not sure on the rcd type you have but im guessing type AC which you arent suppose to use these days (if altering circuits etc)