If you are getting your masters to improve your GPA then yes, hold off on applying until that May/June you finish the one year program.
For any other reason, or if you do the 2 year gig, then apply the year before you graduate. This way there will be no gap year.