I agree that Iommi recorded some great albums post Ozzy/Dio Sabbath era's, but they weren't Black Sabbath albums and never should have carried the Sabbath name, Iommi wanted to change it but was pressured by the record companies into retaining it.
In my opinion the only albums that deserve the Sabbath name post Ozzy era, are Heaven & Hell & Mob Rules. After that it became Tony Iommi and a who's who of various rock/metal musicians, invariably it always sounded great, but was imo, too far removed from the original vision of Black Sabbath to rightfully carry the name.
He definitely should have fought a bit harder to lose the Sabbath name to be honest. You are right in saying that the music didn't fit the band name at that time.
The lineup changes got ridiculous. Iommi seemed to be oblivious that all the changes were alienating half of their fans and making people lose interest. Still - being a legendary guitarist he was able to pull some serious talent into the band, even though it didn't stay there long!