help with picking a motor

Hi, I am new to the rc monster forums and hope someone can help me out.

I have a Feigao 12s running on 12 cells in my rc10t2. Oneday i put the 12s
in my stampede only on 6 cells mosty becouse my girlfriend and my sister's boy wanted to run their pede's too. With so few packs to go around the 12s would have better run time then my 18t brushed motor. I really liked the motor in the pede alot more then i ever dreamed. So I'm thinking of making that it's new home and getting a better motor for my t2
or getting a bl motor for my pede

What would, if any, be better than the 12s in my t2? TopSpeed is what i look for and all i care about on the t2.

I'm looking for long run time and not much faster than the stock stinger motor as far as speed goes on my pede, but want to be able run 6-12 cells if want to go faster one day. I thinking the 12s is great for this, but i want other people's input.