I'm a bit concerned about Worf's comments about embracing pacifism; western pop cultural ideas of pacifism are almost always hypocritical, simplistic, and mainly exist to be mocked.
OTOH, while I have no faith in the writers being willing or able to pull this off, I would love to see an exploration of Vulcan-style nonviolence as established in the novels by Josepha Sherman and Susan Shwartz: their version of Surak understood that peace is not something that can be "achieved." It is not a fixed state to be won and then defended, it is an ongoing process.
Surak spoke of waging peace the way others wage war; with aggressive strategy and tactics, clear mission objectives, and technological development --a truly civilized society must be prepared to wage peace on an industrial scale. He understood the value of accurate and timely intelligence (without which logic would be useless; one cannot extrapolate without data), reliable logistical infrastructure, and solid morale (built on logical certainty of your inevitable victory), as well as the need for individual discipline, integrity, and self-sacrifice --the same foundations upon which Klingon (and, for that matter, Romulan) honour is built.
Worf, as a warrior who fully embraces the values of the Federation, would absolutely gravitate toward Surak's teachings, seeing them as complementary to those of Kahless, not opposed.