Needs more cow bell!
Just kidding
I think that both themes got a lot of potential! What I would suggest is to work more in getting in sync with the drums. Kick and snare drums are your guide and try to lock in with them while playing. It might take a bit of time to get in the groove, try listening to drums and isolating each element in your head (hi hat, snare, kick). What you could also do is try to simplify the riffs. When we compose, we often come up with more complicated stuff then it should be. Try removing few notes here and there (especially if its strumming, try replacing some 16ths with 8th notes) and simplifying to see how it will sit with the drums.
Since you have the main themes going on, try working more on the backing track : adding bass and making drums a bit more diverse in the middle theme/section (adding fills etc). Drums play a big role in the band and can really make or break the song + they are especially good for gluing two different song parts together (and compensating for drastic harmonic change).