Note that if you stick with SPDs, all of your pedals can be used with the same shoes.

Also, with pedals, I think that unless you have a reason to change systems (like foot or knee pain) it's good to stick with what is familiar, so that clicking out in an emergency is easy and automatic. (This is the good ol' "If it ain't broke, don't fix it").