Hm I think you should reinvestigate both options. Migraines are almost as mysterious and diverse as anxiety itself! They can cause anything, regardless of frequency. The puffy eye feeling is absolutely classic migraine, I really would try and treat them as such and see of it helps you! Better to rule out physical causes first, right? It might be much simpler than treating it as anxiety when the solution is much easier. As for the sinus surgery, it doesn't sound like he would recommend it without a reason. I had awful chronic sinusitis for 5 months and my face was numb a lot from that too. Mine was caused by allergies so I found a spray that worked forme and the pain and numbness is now nearly gone :) but sinus problems can definitely cause facial numbness. Also do you have any problems with your wisdom teeth or had any surgery on them/other back teeth? It could be something to do with that too.
I'm not saying for definite that your symptoms aren't anxiety, I'm not a dr, but if it were me I would say those symptoms are very physical and I would continue to investigate them. It's understandable that all this waiting and not knowing would make you anxious though! Like I said, it might still be down to anxiety, but wouldn't it be great of they weren't and. could be fixed easily ? I wish you all the best-- I hope you get answers soon, don't give up