I think you and me are at the same boat, I had lot of trouble while getting PR due to Buffalo office closure etc..etc...
when they changed the citizenship rule two years back ,I was eligible exactly on the same day they changed the rule and could not apply and had to wait two more years...now again they reverted the rule , however it is no use for me as I am again eligible with both old and new rules
I also wanted to finish this as early as possible...but I have waited long enough and can wait few more months...
good luck guys..