I just opened it up and I really have to say that choosing a sawtooth wave and a slight offset (around 0.10 - 0.50 ) really brings the bass forth (maybe it is just a personal preference :) - just a suggestion)
Really good man. Lots of energy and a very strong beat. And that bass in the second part is gorgeous.