My story is similar to yours. I've just recently gone from 100% hardware to a more hybrid setup. I found that while I was having more fun with the hardware setup I wasn't finishing songs. Personally, I still need a computer to do editing and arranging. My new setup is a small eurorack skiff, Bitwig 3 and NI Maschine Mk3/Jam/S49 Mk2 w/ Komplete Ultimate. The integration between NI hardware and Maschine/Komplete Kontrol is amazing, feels like the best of both worlds. I'm definitely considering the Push 2 for Bitwig, although the Maschine Jam does a pretty good job as Bitwig controller.