yeah, I agree... do what's best for the song.
Just remember that about 99% of the people in the audience are mostly tone deaf and won't notice anyways and all they want is a good show. So don't agonize over it too much.