You definitly should try the punch control. Try it just for a few pack at 60-70%, maybe it will be OK for you, and it definitly would increase your pinions life ;)
Before changing the spur, try NOVAK pinion, with plastic spur you will break the spur every set of lipo :(
Inferno VE MMv3 NEU-CC 1515/1Y 4S "Flying machine"