I also had a leaking Rowenta for several years. I absolutely love my Reliable steam generator iron. It produces a huge amount of steam and you can bypass the auto shutoff as well. This is the model that I have:
I did also try the next model up, but it was heavier and louder and I prefer this one.