I'd think simpler. First thing is that gasoline and other fossil fuels (and their synthetic counterparts) may be banned long before firearms. I doubt highly anyone'll ban hunting rifles any time soon, let alone black powder muzzle loaders. Eco friendly energy sources are getting bigger and bigger, so it probably won't be more than 10-20 years before current fuels go the way of leaded gas...highly restricted. Not a perfect analogy, as all you need for leaded gas is an additive from Walmart, but i think you get the point.
Anyway, in a world of gunless heathens, the crossbowman is king
Think Rambo...decent recurve bow, arrows tipped with a .410 shell reloaded with some flachettes...not long range, but better than a smooth bore, and more deadly. Plus, shot shells can be reloaded/repurposed with only a few hand tools. Didn't stock up on primers? You can remanufacture a primer using filings from the head of a certain type of match. Black powder's easy, smokeless is harder but still doable. Either way, primers and powder are relatively cheap and store well, plus they take up little space.
Chem-tracing based on saltpetre? Non-issue...any given household in America has decent quantities laying around, as it's used in several common products. Additionally, there are other chemical compounds you can use that will yield similar results with far less 'exotic' compounds. Please don't ask for any details on that, as I'm not going to be teaching people how to illegally manufacture class-4 destructive devices. I'm just trying to give some food for though, as well as a MUCH safer alternative to what you currently have in mind.
If it involves gasoline, it'll involve gas vapor. Vaporized gasoline has a much greater explosive yield than any solid propellant, and your weakest link (seals on your piston for instance) are the only thing standing between you and a Darwin Award. PLEASE don't mess around with what is essentially a combustion-engine based firearm...there are reasons the military has never come out with, say, plans for an improvised gasoline-powered mortar (which isn't too far fetched if you look at some of the other improvised weapons we designed for resistance fighters in WWII).