I had to go back couple of pages in my inbox to locate your PM. Sorry, I had missed it earlier. Now to your query...
Plz note that while u r applying, the current designation that u r employed under, needs to be mentioned in the apps. Not what u were trained for, or what u used to do earlier. Unless, there was a conflict of NOCs between the two; & one of them isn't in the CIC list now. In your case that's not the situation.
Secondly, it doesn't matter what your designation (job title) states, till your job duties match the description/s of the chosen NOC, u r good to go. In your case again there doesn't seem to be any conflict between the NOC & your current designation. Both, your previous job & the current one have the same "lead" job title... there's only a suffix added into it. It should make no difference.
As regards your waiting to apply after u get promoted, I practically do not see any merit into that gestation. U might as well apply now, 'coz even after your promotion your lead job title remains the same (as stated by u). Once again, until it is in the 29 NOC list u r fit to apply.
Qorax