Current Holy Spirit is much better for managing mp and heals, and it's dps neutral in the current rotation.

Clemency: 2000 MP for 1000 self heal

Holy Spirit (1): 1000 MP for 350 damage and 400 self heal
Holy Spirit (2): 2000 MP for 700 damage and 800 self heal