Eric, the yaw wanders about on my AHRS also, I just lived with it, I have given up on mine after trying a DJI F450/naza. I just couldn't trust my X650 with a faulty FC. I actually had to resort to permanently flying it in NOR mode and it flew well like that I have to say. It was just too unpredictable when switched to ATTI. I will continue to use the FC for gimbal control in the future if I need it. I now have a Naza and turnigy plush ESC's on my X650 and its great, a completely different beast. Initially it was a V8 but as the Naza will only support 6 ESC's/motors it will have to remain a V4 till I can get a wookong.
Maybe you should just cut your losses and invest in a new FC (and compatable ESC's). Worth keeping the frame though, they are good IMHO and the load rail and landing skid system is great.