Depends.
If you're using a whip, then you'll automatically have to train attack to 96 and therefore raise your cb. Also whips have that chance of def xp when you're style swapping/item switching so you need to be careful.
Dragon isn't as strong but it saves you 3 cb levels. I'd say wait till the comabt rework and then decide from that.