I have exactly the same problem you are having.
I got as far as upgrading the kernel - and you mentioned that it was still loading the wrong devices. I need some guidance as to what modules you took out of etc/modules - and - something about finishing an upgrade.
any help would be grat.