I think that the status quo is just dandy. Yes, the Pledge was changed in the 50's (I am old enough to remember), yes, it is, almost surely, unconstitutional (I say almost surely because, atheists were unable to have "In God, We Trust" removed from our money, when they brought it to court) and yes, for sure, any effort to drop the "Under God" phrase would cause an uncivil war. I love the solution that the California court has adopted. No pledge, no foul.
At some point, even those, like myself, who are not Christians, must accept that we live in a Christian influenced society. Christmas is a national holiday. The White House has a big tree. They also do Easer Egg rolls. We all sing Christmas songs and exchange Christmas presents. We all celebrate Thanksgiving and Mardi Gras. We take the fun part of Christianity and leave the prayin' to them. If I took the Pledge of Alliegence seriously. and, if I would feel uncomfortable or hipocritical saying "Under God", I would just not say the part that I wasn't willing to pledge to. You know, take what you like and leave the rest behind.

                   Mike