Why not rip out both RCDs and all the MCBs and replace with RCBOs? The space taken up by two RCDs will give you space for 4 RCBOs which is four extra circuits on top of all your previously MCBed but now RCBOed circuits?

Just link up the two neutral bars and link up the two live bus bars....