If cost wasn't a issue, then I think I would.
For the meantime its just getting the wiring updated which should keep it from tripping.
Had a look into a board with all RCBO's and seems would be a good idea, so at least will only take out one circuit if a fault happens.
Will get my...