Keiko was one whale and he wasn't a particularly good candidate for release. It's not fair to say that rehabilitation doesn't work based on this one example. Researchers were never able to locate Keiko's original pod, a pretty major aspect for the lives of wild orca. Rehabilitation might work for a different orca, but outside of the recently captured Russian orcas, there aren't really any good candidates.
As for the viability of the new tanks... A good chunk of the whales will probably be around in 10 years, there are some younger animals in there. (and the captive lifespan is slowly increasing, though it's still not very high) They're also gonna keep breeding to replace the ones that die. Maybe better living conditions would improve their lifespan, it's generally believed that they don't live long because of stress related to captivity. Larger tanks, better management, and more enrichment may benefit them.
I don't think Russia has as much stigma against orca captivity. There are certainly people there fighting and protesting it, but it's not getting the same reaction it would get in the US. More and more people all over Asia have extra spending money, so, that's more people to go to aquariums and theme parks. And orcas are a huge attraction.
Don't think your idea would work for captive orcas. Again, outside of the Russian orcas, hardly any of them would be good candidates for release. I could maybe see that idea working for Lolita (if she's in good enough health) but not any of the others. (it is pretty much what they did with Keiko) For starters, a lot of captive orca have holes drilled in their teeth. They need to be cleaned out multiple times a day, can't do that in the wild. Second, hardly any of them have known family. Without a family to take them in, they're not really gonna be able to live as a normal, wild orca. Third, most of the captive bred orcas are mixes of different populations. Even if one could be released into the wild, it might not be responsible.