Would recommend going to 30 amp continuous IMR's, when running at high watts, it requires an ample amp supply to put out when boosting the voltage up so high. Likely, if you dialed the watts down, then she'd fire for some more vape time.
I'm a big proponent of getting the highest amp continuous batts that you can get. They just have more Useable power. Not only more power, but also safer. Even on like 15 watt devices, on will get superior performance out of a higher amp batt, and longer running time.
Vape long and Prosper.!!!