help with motor choice?

[rcsammy]

ok i currently run a Feigao 9L in my rustler on 3S lipo
its geared 13/90 and hits a top speed of 50mph
it runs at around 120*F constant for the whole run

so im really pleased with that motor and how it runs but its got a bit old and has started running very hot recently so im looking to upgrade a bit

ive been looking at Medusa motors, i hear they are similar in performance to Feigao but alot more efficient
Medusa motors are also around the price i would like to spend

but the question is: what Kv Medusa would i be best off going for?
i deffinatly want a 60mm can like my feigao as i have run a 50mm and its just not the same
but Mikes site confuses me a bit, according to the chart the closest Kv i can get to what i have now is 2000, but according to the list of motors to buy the choice is either 2200 or 3100.... so should i go lower or higher? if the Medusa will run cooler than the feigao i think i would be better off going for the higher Kv but im still fairly new so would be good to hear your opinions :)
Thanks, Sam