I just got off the phone with my priest. I gave him all the details of our situation. He said the annulment lady is confused, because based on the circumstances, my boyfriend can do the short non canonical annulment just like I can! He's going to meet with us on Tuesday night to go over everything, but he told me not to worry, everything will be fine.
Phew! That was really upsetting me, having to make that choice.