If it's only a month or two difference to wait and file in your new district, then I'd wait. I was in a similar situation, although my move did not materialize anyway.
From what I understand, so long as your case is still with the service center and not yet transferred to your "old" DO, then it should not make much difference -- the SC will send to your new DO once they get your new address via the national customer service center -- and they'll hold off scheduling your interview until you're eligible in your new state / district (i.e. you won't gain anything). What is less certain is how much you might be delayed if your files are already at your old DO.
In my opinion, anytime you ask the USCIS to move files / transfer cases between offices, or re-schedule or delay something that they've scheduled for you, you open yourself up to all kinds of potential problems. Wait if you can.