Need Advice on MIDI Controller

I currently have an Ableton Push. Though I like the Push in a lot of ways, I feel that:

1) Trying to play melodies on drum pads is suboptimal and murder for my fingers during long sessions

2) It's preventing me from developing more skill with a standard keyboard (the Push's approach to chords etc is cool but does not translate readily to other musical contexts)

I've had my eye on this: https://www.amazon.com/gp/product/B005M02VNW/ref=ask_ql_qh_dp_hza but I have to say I was surprised by how shitty the key bed was on their Launch Key series and so I am a bit apprehensive. The Ableton integration is nice though.

My cousin who is a big analogue head says that I should skip the midi controller, and find an analogue synth such as the Minilogue http://www.sweetwater.com/store/detail/Minilogue that can double as a midi input. There are limitations with that approach I'm sure.

Anyways, I have $500. What should I do? I appreciate any input.

PS - the Komplete is very cool and can help a noob like me with scales, but I am unclear how well it bridges the gap between the NI and Ableton worlds. Keyboard was very nice in store though. 

I use an ms2000 as my MIDI keyboard. I can't imagine taking up space with a plain MIDI controller

I have a push also