Keyboard.

After I remapped the keys so they didn't suck (jump to the up arrow), I find keyboard much easier.  Admittedly, I haven't used a controller much so my thumbs aren't nearly as dexterous as my fingers.