Migrate BDE Delphi 5 to ADO Delphi 2006

I have to upgrade several apps from Delphi 5 using the bde to Delphi 2006 and ADO. I don't actually have the new version of Delphi yet so I am changing a couple of forms to ADO in Delphi 5 right now. Are the ADO components the same in Delphi 2006? Should I be using ADO datasets or ADO queries? I use cached updates a lot. What would be the best approach to this kind of upgrade? Thanks.
.