If 2013 gets you over the line i would run with someone who will just take this year to avoid any issues with averaging over the 2 years or limiting any increase of 20% from 1 year to another.
Should be able to get a good rate an waived fees at that loan and lvr.