Your CPL exam theory results should be in the CASA database so you shouldn't have to resit them. I know a guy who sat for his IREX exam in 1992 and got his MECIR in 2007 (like you, he's been out of the system for some time).
Unlike ATPL exams, I don't believe there's an expiry date for when all CPL exams have to be completed so you should be right.