I am assuming that if I have language proficiency level 6 then I do not have to do that again.
Sounds like the most economical is to just revalidate my MEP-IR and then submit all the paperwork after the re-issue date on my CPL. That way I save some money regarding license issue (1 instead of 2) and won't lose any licenses/ratings.