It's worth noting that the Holy Fire glyph is changing so that it is no longer an instant ability, thus removing it as an option for on the move healing. You take Mindbender and lose an on the move heal in return for 10-11% mana/minute. Or, you take Power Word: Solace, gain an on the move heal and a realistic max of somewhere between 11,3% and 14% mana if used 5 times/min. You can drop to 4/minute and still not have it be patently worse than Mindbender if you don't have Evangelism stacked all the time (Which you won't, if nothing else for Archangel use). Personally I'm going to use it even if I can only guarantee 3 casts per minute. The on the move heal is just that valuable, and as we move up a tier, I'm betting I'll be able to live with 1-2% less mana/minute with a higher tier of gear.
I'm also wondering if standard 3-min CD Shadowfiend has been put into this calculation? If it hasn't, Power Word: Solace seems to be the clear winner with mana returns close to Mindbender on a minute to minute basis, and an extra influx from Shadowfiend every 3 minute.