If you just set (setq org-replace-disputed-keys t), org-mode will remap those conflicting keys. It is also preferable since you can still use Shift + Arrow keys in date selection.
Please see http://orgmode.org/manual/Conflicts.html for more information.