I don't have any recommendations FOR anyone in particular, but I would ask you to not use Academy in Waco.
It's the blind leading the blind over there and I kid you not, I had to explain to them the process of doing a transfer. After several "so and so isn't in right now, call back on Monday" I finally got the gun after a 2 or so week process. It should have been about 2 or 3 days.