I would recommend you to switch to xfree86 4.2.0. There are some unofficial debs now made by the guys who maintain xfree86 in debian. Look here for the debs http://people.debian.org/~branden/
Recently I had some problems apt-getting some debs from there so I would recommend you to use a mirror site for branden's debs:
Perhaps this fixes your problems.