Sanji, maybe.
Zoro, yes The manga did set it up for Zoro to destroy his steel heart.
The most interesting thing his fight with Sommer is not only does he has a steel heart. He has the omen flames that has the ability to turn into different things like steel. Zoro is a swordsman known for cutting steel and flames. I don't think that's a coincidence.