I think a combination of both could work. Have you tried cutting certain parts of both bass lines out in order to rearrange them and make one bassline out of the two? I think you could get some nice movements by doing that.
Sounds rough and pretty cool. The second part could work better for me if you'd mix up the break beat. Maybe something with the snare on the one or something. Could be a good contrast.