TBH, player one doesn't need any mechanical changes. All he needs to do is sing hymns when using his music abilities, say prayers when casting spells, and take Knowledge (religion).
For player 2, I'd say let him play the Crusader (ToB), and maybe give him access to Shadow Hand maneuvers via feat or discipline swap, say, with White Raven? Or, maybe a Skarn Swordsage?