Xander doesn’t need fixing -only maturing-as they all do. Also, Xander is a Watcher and a Seer which was revealed when Caleb took his eye in the last season. Caleb literally referred to him as the one who sees. Go back a season when Willow went on her witchy rampage after losing Tara. It took Xander to know how to bring her back down.