Thinking of moving on to Ableton, or just wait for Maschine 3.0?

I love Maschine, but I feel like the arrangement and other features makes creating full songs take longer than in many DAWs. I'm interested to hear what people think? I'm hesitant to move on to Ableton because of a possible Maschine 3.0 update coming soon though. If they can make creating a full song faster, I'd love to stay with Maschine. I just don't want to spend money on Ableton and a MIDI controller like the Push 2 to have Maschine come out with something that can solve my issue. Would love to hear people's opinions on this.