Well, my advice would be, strip things down, go back to basics, and try to treat each instrument as a percussive element. How does it fir with the rhythm. rather than putting a lead hook over the percussion. Try to put it "in" the percussion..
Does that make sense?