cooldown should be getting reduced by haste, as of the same build that changed the base cooldown (as with many other effects).
There are likely still tuning changes needed, mainly due to the strength of Geistbeuger
's added damage with the new Atonement. Note that the difference isn't quite as dramatic as it appears on a raw comparison, since Solace's effective mana value includes the cost of the Smites it replaces, and similarly, 1/3 of Geistbeuger
's damage offsets the Shadowfiend that it replaces. We'll look at the tuning.
edit: you beat me to it. But yes, Machtwort: Trost
should be quite reasonable as it is; that row shouldn't need anything more than the usual tuning that happens during beta.