You know what ruled even more?
I've been listening to the drumwork as well (what you gotta do when you're a drummer for 13 years now?) and think some parts needed more subtleness to it. (Especially some drumfills i think)
Now i just got this slight idea, what if you posted a version without drums and i record some nice 'ol acoustic drums? Friend of mine has a really nice home-studio (Pro Tools equipped, Focusrite pre-amps, pretty good mics and has a great collection of drums/cymbals too) and i could lay done some tracks for ya (i could include triggers too). Let me know