Dude, I hate to tell you this, but probably the best thing to do at this point is go and slap the guy that sold you that setup as a starter kit! Just kidding, of course.

But if it were me, I'd scrap it as soon as I could get an inexpensive mod with built in battery and adjustable wattage, and a
tank designed for mtl. This is a good, simple way to start. I started with the Aspire Zelos kit, but I'm sure others can point you to starter setups they like. The Nautilus 2 is extremely popular for mtl with factory coils. And you'll probably "graduate" to using external batter mods, but this one makes a great emergency backup and is simple to use. I use
fasttech a lot, and they have great prices, but shipping from China can take a few weeks - especially if it isn't marked "In Stock."
I just don't know how anyone could zero in on what they like/need with a fixed wattage mod. You could get just about any tank to work on it to some degree.
Of course, all this is based on
my experience, and it sounds like the setup is "kind of" working for you, so... take it with a grain of salt.
$43.42 Authentic Aspire Zelos 50W 2500mAh VV VW TC APV Mod Kit - 2ml / 0.7ohm / 1-50W / 0.5V-8.0V / 100-315'C(200-600'F) / aluminum at FastTech - Worldwide Free Shipping