Reply to Equipment with an S4

So when the S4 comes out I am upgrading to that over my RMX. Right now I am just using the RMX, Korg nanoPad, and Kontrol.

My question is, is replacing the RMX with the S4 enough? Is there any other thing you would add to that set up, definitely keeping the Kontrol for extra knobs. Was believeing about ditching the nanoPad for a Midifighter.

What are your thoughts?