[BrianG]

Just the fact that reducing your pinion drastically improved runtime proves that you're geared too high. Like suicideneil suggested, go with another cell to gain higher voltage and then gear down to around 14T, and you will be much happier I think.