Hyper 10SC: Neu 1506 or 1409, opinions?

[DrKnow65]

I've got a Hyper 10SC that I've been running at the local track. The current setup for powertrain has progressed as follows...

First setup; MMP- 4S 2650mah 40/50c- Ammo 2300KV 3650
Not enough power, motor ran HOT

Second setup; Phoenix ICE HV 80A- 8S 1300mah 40/80c- Neu 1515/2Y (1100kv)
Good power, lacked snappy punch of the higher KV motors, no heat, ran 25min...

Current setup; Phoenix ICE HV 80A- 8S 1300mah 40/80C- Neu 1515/2.5D (1680kv)
INSANE power, way overkill for the track, batteries get warm, ESC is cool, motor is cool, driveshafts are breaking.


What I would like to do is loose a bunch of motor weight (~4oz) and end up with power somewhere between the 2Y and 2.5D 1515 Neu's. The motors I'm looking at are the 1506/6D at 1700kv, and the 1409/2y at 1820kv.
I know the KV's are higher but I think when I gear down for similar speeds I should end up with good bottom end...

Opinions? Short and fat 1506 or the longer and narrower 1409?