Check your airport. My concern was flying SW from Pheonix to Houston earlier this month. TSA is the group that can cause headaches. Thankfully, Pheonix is a vaping friendly airport and I had no problems. I passed thru security with my bottles inside a ziploc. They did not even blink at the liquid, the mods or the batteries.
Flying SW, have a plan for your batteries. Online regs state you cannot carry Lithium Ion batteries in checked or carry-on baggage. As I said TSA didn't blink but I had my 3 spares in a belt holster, one in a mod and another in a flashlight which I also pocketed.
My plan was simple. If I had been hassled, I was prepared to drag every laptop user on the plane under the bus with me.