You are most likely in the "safe zone" but there is a reason for concern with sub ohm vaping and then there is a lot of ignorance. Know the specs of your battery, always use an ohm meter and have an accurate multimeter to check your battery life.
I see you put what you had but there are two models. There is the 1600 mah and the 2000 mah. I remember the 1600 is a 23-24 amp battery and not sure on the 2000 mah. Use a calculator like this one.
http://vapecalc.com/ . Your battery fully charged is 4.2V so your current setup is 6.46 amps with a fully charged battery. You don't want to be near the max amperage of your battery. So for a 23 max amp battery I personally wouldn't make a build capable of putting out more than 12-13 amps. The reason is if there were to be a short the voltage will surge.
Ohm meter and multimeter are self explanatory. Not using one is just asking for potential problems.