there are a lot of options
going to a regulated box mod should be a nice upgrade for you
if you can i would suggest getting a mod and a tank seperate (dont forget in most cases you will need batteries and a charger 2)
i dont know the smok kit (others will be able to give info on that one)
have a look at the kangertech topbox(mini) they can come in a set (mod+tank) wife has the kbox mini (mod only) daughter has the set (kbox mini + tank) we had a lot of leaking issues with that tank the coils have quality control issues
atm i'm using a joyetech cuboid with a smok tfv4 tank and a bachelor rta have more but thats over 95% wat i use
an other mod to look at would be the rx200
you will notice that you have different wattage levels and a different amount of batteries, keep your budget in mind
and its not becouse a device can deliver 200W that it has to
i use the cuboid at 30-40W bachelor (mostly temp control) or 70-95 tfv4 depending on the coil
for
tanks you can look at aspire, joyetech cuboid (some love some hate, i like but prefer others), smok tfv4, .... hae a look in the tank sections, look on youtube (then come search the things you find here for a more honest review ;p)