With time I got to believe that making a tight song implies focusing on a main theme and don't let ourselves get stuck with good but out of range riffs. In the end, the sacrifice is not so bad since it's possible to recycle the unused parts for other songs.
About the drum, I just copied your drum ChainsawVsGod, and pasted it into Kieran1997's riff in order to make it heavier, and then I added solos over it.
This can be an intro dude. Like Slayer's "Captor of Sin." Now you and Slayer are almost 2 completely separate musical minds but it can start really heavy (this), go into something different, return to this style in the bridge, return to the central idea, and then make an outro like this.