I make a point of NOT using the word "gun". I'm not perfect at avoiding it, but I do make a conscious effort to go back and replace "gun" whenever I type it. Rifle, pistol, revolver, shotgun, firearm....
I do, actually, quite often use the word "weapon" to describe a firearm. "My weapon of choice for coyote hunting" (which is kinda just a vernacular, as I use the saying "weapon of choice" for many things that aren't weapons at all, as in my 'weapon of choice' for cutting trees is a 22" Husqvarna), or "my concealed carry weapon...", which I certainly believe is fitting for the application.
Frankly, it's no better than smoking bunkweed to think avoiding the word "weapon" is going to stop ANYONE from coming after your "guns". Again, it's "gun control," not "weapon control".