Upgrade to 2.6.22.11 - NVidia driver incorrect

Previous system was 2.6.22.10. In that version we did have problems and found that xserver-xgl was being loaded my default but didn't remove the 00xsession-xgl-start file from Xsession.d, so we got that working correctly, and the Nvidia card was correctly identified as a Geforce 6600GT and used correct driver as Nvidia-Glx-New, but this new update has screwed things again.

This time at lease it says that xserver-xgl is now the default server. But something new has been put into the soup. A x configurator that is incorrectly configuring my system as having a Geforce 6800 and installing nvidia-glx. If I try to install nvidia-glx-new and fix my xorg.conf file, upon next boot, that configurator starts again and says to configure my screen again.

How can I get past this????