It's harder to get a motor that runs good on 2s and 3s than on 3s and 4s because you have a 3rd difference in rpm instead of a quarter.The 1920/7 might be the ticket though,(33k rpm on 2s,and around 50K rpm 3s).That's what Thunderbruiser has chosen to do,i think he has 2s packs already but wants to run 3s aswell.That should do nicely on the track on 2s,it'll run very long runtimes and should run cool,I don't think it'll be blisteringly quick though but probably as much as you can laydown on the track.On 3s it will scream,might get a little hot but should be good for the occasional speed run/bash session,you might have to let it cool every 5 mins or so on 3s though.
Why not use your 5300 on 2s and get a motor specifically for 3s?The 5300 can probably get the best out of a 2s pack anyway.
I'm using the Flightpower evo20 3300 lipos,they're well priced and in the UK.
I have a lathe so i just run a 4mm drill through the 3.17mm(1/8") standard 48p pinions.You need to bore them out on a lathe for them to run true,if you're stuck and don't know anyone else with a lathe then i can help you out,just PM me and you can post me the pinions you want to use(alu. or non-hardened steel would be easier 'till i get my carbide drill bits).4mm is the way to go.
Edit;funnily enough we had almost this exact same discussion earlier today
http://www.rc-monster.com/forum/showthread.php?t=3029