For firearm storage, check out the Bullet Trap in Plano (on north side of Richardson). From downtown Plano (east side of US75), go north on Ave K. It will be set back on the east side not far from downtown. They also have an indoor range.
Tues-Friday, Mike's Gun Room is open. Great guy, an old Leatherneck. He is just north of the intersection of Greenville and Beltline/Main in Richardson. He is on the north side of the Richardson PD parking lot on the east side of Greenville. Often has some pretty interesting stuff. He is kinda quiet around strangers. However, after he gets to know you (about 5 years), he will tell you some hair-raising stories from his 3 tours in Nam, first as a grunt, then as a 90 day wonder, and then as a FAC in the Bronco. Retired as a Major. He is the real deal.
I hope you and your Mrs. get to Texas in time for your son to be born a Texan. My Texas-born wife says that is the only way to be a true Texan, other than dying in battle fighting Mexicans, Yankees, or Liberals.
I wasn't born in Texas, but I got here as soon as I could.