You got it!
And to throw in my .02...
You might also want to get an 18650 to do 3.7V
vaping. That's what you are used to with your stock equipment, but it's a whole different thing when doing 3.7V on a chuck. You may find that it's enough of a step up from what you have that you don't even need the HV. It's nice to have both options though.
You will also get 2-3 days on one batt when you go the 3.7V route.
[/.02]
BTW: excellent choice on getting a Chuck. You will not be disappointed

Whatcha gonna get on it?