Keyboard for sure, i'd rather use all my fingers than fumble around with only my two thumbs. For some reason i find that i'm better using controller playing SF rather than MK

Back on topic - I'm almost tempted to buy a x360 just so i can play this. It'd be great to finally have this game online on console instead of just on PC, even though playing on keyboard is so much better.