Indeed...I should have been more clear. Plain old vv/vw APV with Protank or similar.
You don't need more than 10A max discharge for this application and if you go with this lower discharge rate you'll get more mAh for longer use between charges.
In 18650 size I would go with Panasonic NCR18650PF 2900mAh 10A as a first choice and NCR18650PD 2900mAh 10A as my second choice.
Illumination Supply has the PF in stock as does
Orbtronics. I bought a couple of the new Sony 30A batteries from Illumination Supply a couple of weeks back for sub-ohm vaping. Shipping to Canada is reasonable and it didn't take long to get here. I don't know any Canadian suppliers for these. These batteries are hybrids that do not vent with flame, similar to the IMRs.
In 18500 size you have less choice. I would go with AW 18490 1100mah 16.5A IMR batteries. Happy Vapor in Toronto
has them but they're expensive. JR Custom Turnings
has them at a much better price. You can also get them from the US.
HTH.