When editing patches I generally don't use remote MIDI controllers, since their resolution is too coarse. A MIDI keyboard (with velocity, aftertouch, mod wheel and pitch bender) is essential though, but you have that covered already.
Also do consider using multiple monitors, as big as you can afford. That way you can leave everything somewhere directly visible, and keep your neck moving (imagine stock brokers, surgeons, or flight coordinators doing their job on a single monitor... what makes (y)our work so much less important that you have to make do with less?
). And "a laptop" doesn't sound like you love that machine very much.
I recommend getting a computer that has a really low noise floor, and doesn't distract you in any way.