Do you have a source that you've found convincing on those surah being abrogated?
Presumably sources that say that was only for Mohammed necessarily would condemn his warring (making him not a paragon, and destroying a central premise), and what of the caliphs that followed Mohammed. I'd be interested in a mainstream condemnation of Islamic military expansion, if there is one?
Even the "righteous" caliphs did all kinds of things contradicting the Sunnah, so I don't think that's a very useful yardstick. But overall, given that the Caliphate had plenty - indeed, early after the initial conquests, the majority of its population - following different religions, it's pretty obvious that the commandment wasn't taken quite so verbatim even then. And, on the other hand, consider the ultimate fate of the Kharijites, who kinda took it to heart.