Yes I would call the airlines. You CANNOT put batteries in your checked luggage. I believe this applies to internal batteries too. If you are departing from the US you will need to follow their rules for liquid storage in checked items to get through customs anyway so that may mean liquids. deepening on how much you bring, would have to go in checked luggage. I would be surfside if the airline says liquid is vape gear but they might. You really need to call them and ask. Also, due to pressure changes you may not want to have liquids that are chock full they may leak. Same with tanks, you will want to carry them empty so no leakage happens.
Best of luck. Call the airlines you cannot be too careful. I don't know exactly when "flying the friendly skies" became "If we find a pocket knife on your kid your entire family will be detained and caned." Well I kind of do. But I don't play. Not with airlines. And I sort of like fooling around, honestly. But not with airlines.
Your friendly US Ambassador's office may be of use somehow as well, I'm not sure (I am again assuming that ambassadors are friendly. I wouldn't know. My only real interaction with one was some Romanian dude rear ending me, jumping out of my car and freaking out and then saying, "I just quit smoking! Do you have a cigarette?" LOL he acted EXACTLY like a frightened teen who just crashed his parent's car. He wasn't unfriendly exactly but he did no inquire about my welfare either and I was bleeding.)
But they could be useful. In general? IDK.
Anna