things are looking good so far. You have plenty of time to succeed, so that's good. Since you have so much time, I think the two things that could really help you most is first: try and secure your leadership in the new office. I mean you will have a few years work in front of you, and you probably want to do this anyhow, but if you can get some nice leadership here, it can go a looooong way. Secondly, given the amount of time you have, if you don;t have a significant amount of volunteer work, NOW would not be too early to start. Maybe you can even lead some initiative, by starting some idea/organization/charity/whatever through work.
finally, when you do take your GMAT, I would say take it at least by the December before you want to apply, that way if you don't get exactly the score you want, you have plenty of time to retake.
If you like the post, give it a KUDOS!