After cleaning up, I rebooted and X restarted with no problems. I'm now using fglrx 11.6 with no issues. debsums reported one missing file, which I fixed by reinstalling xserver-xorg-core.