Battle cry of love?

I have been looking through my songbooks over the last few days looking for songs to introduce to music group and to church here in St Annes. So far nearly all of the songs that I have introduced have been Stuart Townend ones, he seems to be a particular favourite of mine. In my Spring Harvest 06 book I came across another of his called 'O church arise'. I love the tune and thought this could be another that I could introduce but I was, for a change, quite disappointed with his lyrics. Although the hymn is quite biblical, being taken from Ephesians armour of God, the imagery seems to be to be particularly and unnecessarily focused on battles and war. The tune is very triumphant and the words about marching into battle. In recent years there has been a trend to avoid war-like imagery, in our hymnbook even Onward Christian Soldiers has been changed to Onward Christian Pilgrims. In such a climate of terror and religious fervour I don't think it is helpful to be singing about 'an army bold' or 'this victory march'. I have begun to write fresh words to the hymn, ones about love and service, reconcilliation and renewal. When I'm happy with it I might even post it on here.