My PC is a SnB Tank that is mostly controlled by the AI, so all my companion warriors are 2H's.
Combat Roll is one of those things that I've learned to live without. This is a good thing, since I put priority on putting points into TIB's specialization. If your problem is aggro management, I'd look into positioning and see what your other 2 party members are doing. If your problem is reading enemy tells (or, this is your first playthrough and you're getting used to the fights), then Combat Roll is a life saver.
Block and Slash is fantastic, since it also blocks the kicks from a dragon. The way I play him is purely single target, though, and especially when using Dragon Rage, stuff dies really quickly.
There's nothing wrong with using Unbowed (War Cry without the taunt), in the sense that if you take Charging Bull, it's only two points away. If you upgrade CB, it basically becomes a 0 stamina ability, since your next Mighty Blow (50 stamina) won't cost any.
That said, Blackwall hasn't got any points into his specialization yet, so I went into Battlemaster with him. There's something deeply satisfying about pulling something and then smashing them into the ground.