Reply to Ableton Push or APC80?

I've used Ableton Live for about five years and got an APC40 about six months ago. It was a miracle to my workflow and opened up a world of live performance possibilities. Recently I have found myself in a musical rut and wanting something more creative out of my home studio. Well as luck would have it, the other day I came across an old check I hadn't cashed. Now I'm in the market for a new piece of hardware but need some advice.

I've had my eye on constructing an APC80 (picture below) for a long time.
http://murphy2dot0.files.wordpress.c...1/02/apc80.jpg

I've never constructed my own gear , and as a DIY kind of guy, the concept appeals to me. Just the sheer amount of buttons and size of the hardware makes it into a live performance monster, with somewhat increased functionality in the studio. I believe the personal connection to the device would be well worth the effort.

My girlfriend is begging me to get Push, saying that building the APC80 is like putting gold plates on a broken toilet. In the studio, I could really utilize a drum pad and means to input velocity sensitive note data. For a while I've been looking at different drum machines, midi keyboards, drum machines with midi keyboards, you get the picture. Just recently I realized that what I'm trying to find is something to take me deeper into the realm of "controllerism".

I'm on the edge about it because coming from a classical background, my compositions can get quite technical, and I worry Ableton Push may limit me. Most Push beats have a tendency to seem repetitive and lacking because it seems strongly oriented to on-the-fly beat creation, which is good, but I ultimately want something both playable that is also a serious "studio tool", not just a fun gimmick.

I found this site, and this community , from Mad Zach's Ableton Push demo on YouTube...
http://www.youtube.com/watch?v=_-B_m3Kpwic

He creates some great sounds with the thing, totally inspired, but in most videos he primarily seems to resort back to his trusty midi fighter to work with his material. So my question to you all is...

Should I invest in Ableton Push, build my own APC80,

OR would you recommend another controller? (Midi Fighter, etc.)

Any input would be great. Thanks guys, first post. Woo!