Where are you from, what would be your outland office? I agree, it would be quite a work to gather everything and fill out the forms again but if you could land several months earlier than it would worth the pain.
The processing time doubled without any official explanation, so we don't even know why take it so long, not mention when will (if will) it change.
In the first quarter of 2014, the processing time for AIP (and some even received DM at the same time) was down to ~ 8-9 months...but it only lasted for about a month.