Reply to best companion midi controller

im looking for a controller, midi keyboard, etc to compliment my setup.
(i have the S4)

i was believeing of an oxygen 8, but i would also like to see perhaps more controls, ie faders, knobs, buttons (not piano-keyboard)

but on the other hand, it would like it to have a piano keyboard, say, 25 keys, to use the same controller as a production tool too

im faced with a decision i dont know enough about....
what do YOU guys believe?