MPC or Maschine (For my setup)

Okay guys there are probably a few threads like this but i need your help with deciding which i should get so ill give you all the info straight up.

I'm tossing between one of the MPC's or the Maschine. Basically I don't plan on using it for DJ'ing or anything but i would like to be able to have a piece of hardware that i can use with my producing. I produce a range of music but predominately traps (as it's called now) kinda stuff but i also make some electro stuff too. I already own Ableton and a novation launchpad.

So as i see it heres how it stacks up

Maschine:
good software to come with it
loads of samples etc.
can be used with ableton as a midi controller
BUT
Can't be used without a computer (obviously haha)


MPC:
dedicated piece of gear no need for a computer
does nearly everything the maschine can do and more (depending on which model)
BUT
A little more pricey (not that bad really)



Some more info i owned an m-audio trigger finger but sold it because i didn't like the fact that it was just a midi controller with no real purpose in my set up. Before you say the Maschine will be the same it comes with it's own dedicated software so i see that as a way around the problem. I have never owned an MPC before either but i know of their great quality.
I'd like to keep it under $1000AUD too


Thanks guys