I'd also check out Woods of Ypres, Wolves In the Throne Room, and Agalloch too.
They're not strictly one genre or the other, but a combination of the two and several others.
Not necessarily JUST like Shape, but check out Pantheist, Ahab, Evoken, Skepticism, Catacombs, and Corrupted.
There are a million others out there, but some are just godawful.
I'm not sure Iommi's riffs are responsible for the overall failure.
I'd accredit Rubin's overproduction of vocals more than anything.
Ozzy seems out of tune in several spots and his voice just plain overpowers the music throughout.
Sad to see that their last effort was a poor one.