Welcome back! Since you've been gone, there are a ton of new gun shops opened in Tulsa and BA. You have got to go to the 2A Shooting Center indoor range-it's the best in the area, if not the state (I haven't been to any of the OKC ones to compare-yet.) There's also Sooner Guns on Mingo, between 51st and 61st; the Broken Arrow Gun Shop on Elm Pl/161st just south of the BA and Bullitt Firearms, at 91st and Aspen/145th (open Saturdays only). More options are always good!
You forgot to mention Arnette Knives and Arms in Catoosa, N.W. corner of Hiway 66 and Pine street in the Cherokee Village!!