Couple suggestions then, and I'll try to give ball park price ranges and what needed.
Good step up with a lot of flexibility
Eleaf iStick30watt or iStick40watt with an Aspire Nautilus, Nautilus Mini, GS Air Tank, One of the Subtank Models, shop smartly about $40-60USD online
Sigelei Mini 30watt, pair of LG HG2 18650 batteries, Nitcore i2 or D2 Intellicharger, with any of the listed tanks above, $55-75USD online (Liion Wholesale, Illumination Supply, IMRBatteries, RTDVapor, or Orbtronics for the batteries and charger)
All in one kits
Joyetech Evic VT full kit (comes with a nice tank and very nice mod with internal battery like the iSticks for about $60-80USD online)
Evic VTC (like the Sigelei Mini 30watt you'll need batteries and a charger for them) Similar kit to the bigger brother Evic VT at about the same price, just a little smaller
Kangertech Subbox Mini or Nano (like the Evic VTC and Sigelei Mini 30watt will need batteries and charger included in price) about $75-100USD
All of these kits put you up in the expandable 30 to 60watt output range, alternatives to the LG HG2 battery would be the Samsung 30Q, LG HE2/HE4, Samsung 25R (very solid and nice battery with a great track record), Sony VTC5, Sony VTC4, Sony VTC3, LG HB6 (last 3 are 30amp CDR batteries over the 20amp CDR of the other models), there are many many more mods and tanks out there as well, we've had a snowball storm of new and great devices in the last 6 months alone and it is continuing to keep getting more diverse.
Online Vendors for mods and tanks you might try Myvaporstore.com, Eciggity.com, Kidneypuncher.com, Madvapes, there are many many more.
Liquids you can check out Nicoticket, Nudenicotine, Vista Vapors, Mt. Baker Vapor, Heathers Heavenly Vapes, and again there are many many many more liquid vendors out there.