For stock shaping, may I suggest both a Nicholson #49 rasp and a #50, which is a bit finer. If cared for, they will last a very long time. They are not inexpensive but after you get them in your hands, you'll reach for them instinctively and settle for no Home Depot/Lowes common grade rasps. If a rasp says India or China on it, run, don't walk away form it. If you are familiar with the Nicholsons, you know what I'm talking about.
Also, study your files...mill, bastard, warding, first cut, second cut, etc. They were intended for specific jobs, and produce different results. Also, you can't expect to achieve good results carving gunstocks with common gouges that were intended for cutting tile. Buy the right tools, then refer to the resource books on gunbuilding and study carefully how they show you to shape an edge and sharpen your woodcarving tools, and then keep them sharp. Incidentally, my masters taught me that a dull tool is also more dangerous to use, as you will be pushing a lot harder and if you slip you may truly injure yourself. You wouldn't be the first gunbuilder to poke yourself. JWH