Yesterday I installed the new firmware update. I think it's weird that there are now two music players, calendars, and calculators. What was Samsung thinking?
Factory reset may get rid of the older version of those Google apps. It worked on my Atrix when I updated to Gingerbread. Plus, it just works better after a factory reset, not unlike when you do a clean re-install on your desktop or laptop.