Have some good ideas in here, you just need to concentrate on getting the mix sorted and everything polished up.
The top end and bottom end seem a bit unbalanced. There are some piercing highs that are emphasized that are keeping me from turning up the volume too loud. Could do with making the kick and bass a lot bigger. The kick could use a bit more bottom end to it as well.
I would try to just remix everything from zero, and then try applying some compression in places.. a multiband would likely do the trick to keep everything punchy and also give the high end sparkle without becoming piercing.