Brushed motor upgrade for aerobird challenger
 

I know this plane has already been well covered but I'm looking for a little more push from it. I run mainly 8.6v NiMH but would like to give some 9.6v packs a try. I'll upgrade the electric to deal with it so it's just down to choosing a motor.
Here are few I'm looking at but I'm not sure which will be best, or which will fit.

JP EM400 Electric Motor (380/400 size)
High performance 380PH motor
Voltage = 6 - 10.8v
RPM (no load) = 19200
Shaft size = 2mm
Weight = 80.2g

JP Pro 400 Electric Flight Motor
Voltage range: 3.6 - 8.4v, ideal for 7.2v
RMP unloaded = 17,000
Efficiency = 78%
Weight = 72g
Shaft diameter = 2.3mm
Motor diameter = 27.7mm
The perfect motor for sport/performance electric flight on 6 cells.

JP Pro 480 Electric Flight Motor
Voltage range = 3.6 - 8.4v, ideal for 7.2v
RMP unloaded = 17,000
Efficiency = 69%
Weight = 92g
Shaft diameter = 2.3mm
Motor diameter = 27.7mm
The perfect motor for performance electric flight on 6 cells.

Which of these look best?
I've heard the norm is to put a 480 in it but the spec only recommends that to be run at 8.4v.

Many thanks.:)

RE: Brushed motor upgrade for aerobird challenger
 

The 480 should be able to be pushed harder than a 400... if the extra weight isn't a problem in terms of CG, then I'd say get the 480. You may have to adjust prop size (downward) if it draws too much for its own good, on 9.6v.

I just saw this:
Electric flight items -> Motors
5510374 JP PRO POWER 480 ELECTRIC FLIGHT MOTOR SRP £4.88

* Voltage range: 3.6-9.6V, ideal for 7.2V.

* RMP unloaded: 17,000

* Efficiency: 69%

* Weight: 92g

* Shaft diameter: 2.3mm

* Motor diameter: 27.7mm

* Shaft Lenght: 12mm