There is talk of the GFDL being made compatible with CC-BY-SA. I would wait and see what comes of that before trying to change licenses, you may not need to.