I agree, you will gain from proper setup.
The appropriate voltage/motor kv/gearing does wonders.
It's a wonderful thing . With my set up, I have no heat issues at all and I feel a lot safer with it then with a 4S set up that I tried once and will not do it again.