Have you thought about getting a full blown Respirator? You can get a 3m Silicone half mask with two carts for 20-30$ at homedepot/lowes these days. The carts they come with i believe are N95/Organicfumes/Acid gas's. You can also get some pinkies for it too on the cheap on the web. The p100's go for 12$ on amazon.com for 4packs. P100 btw is better then n95 as it filters more and handles Oil's.

Do NOT Open Your Organic Vapor Or acid gas Carts! They are chemical based and will degrade rapidly in open air. Make sure you keep check on the expiration dates aswell.

I personally have a 3m Half mask with p100 pinkies on it in a heavy ziplock bag ready to go in my dresser drawer. I have another that I use often during different around the house jobs and they work fantastic with one exception, They collect moister inside like crazy from exhaling. Im sure this isnt avoidable with any mask or half mask so its no biggie to me.