Welcome to NT, Spence!
No one can predict how long it takes to recover, but it does sound like you're making good progress.
I've been dealing with brain injury symptoms for 2.5+ years. I recently started a high dose fish oil protocol and it has been miraculous. Just something to bring up to your doctor. I tried loads of supplements and tried about as many therapies you can try. None have worked as well as fish oil. And it's only about a $1 a day right now and will drop.
http://www.brainhealtheducation.org/omega-3-protocol/
As far as anxiety, that is a common symptom that comes up with brain injury. This is not my forte, so I can't recommend or not recommend things.
Mark's Vitamin Regimen has been beneficial to many, including me.
http://neurotalk.psychcentral.com/thread181974.html