Hello and welcome! I just looked up your setup online and it looks fairly basic to me, which is fine, but this one just looks like a rebranded generic eGo and a CE4
tank. If you are looking to upgrade, and want to keep the same eGo style, I'd go with an eGo twist, and either a Protank Mini, or an iClear 16
tank. I've used all of these in the past, and they provide a much more consistent vape. The heads on both tank styles are replaceable, so you don't have to throw out the whole tank once the head goes bad.
This is a great starter kit for the non-VV (twist) style batteries:
Kanger eVod Kit - Black
This kit is one of the highest recommended kits on the forum as it comes with VV twist style batteries, and you can fully customize what you get:
http://www.myvaporstore.com/Vision_Spinner_Joye_Ego_C_Twist_Combo_p/vvs-c.htm
Have fun and happy vaping to you!