Sorry to hear you are still haveing problems. The extra increase in weight and maybe a bad CG can make it difficult. If you go back to a 1300mAh battery you should use a higher "C" rated battery or go easy on the throttle to prevent the battery puffing again. Five minutes is about standard for a EDF just DON"T drain the battery to much that is very very bad for a lipo.
My Typhoon weights 540grams, length 99cm, width 68cm, motor turingy-typhoon 2215-4500(helli motor), Turingy 2200mAh 3s 35-45C. After about five minutes of flying I land, when I recharge the charger will show a % of what is left in the battery, it's usually betwen 20-30%, to go any lower will damage the battery.