Both items you are looking are very decent. I'm a fan of shimano gear in general. Since you have used spd's before, be sure to set the tension on your pedals very light. The instructions will be in the box with the pedals, but basically you'll see a little screw that uses a small allen wrench, above it in an arc a "+" with tick marks like a ruler has and a "-" turned towards the "-" lightens tension and towards the "+" tightens the tension. As you become accustom to clicking in and out you will probably want to tighten a little, but I would start at the lightest possible. As you start rock hoping and jumping you will definitely want to tighten so you won't accidently pop out.

The shoes are the bomb, they are the ones I use. Before screwing on the cleats put on the shoes and mark where the knuckle of your big toe is, then when you screw on the cleat line the front of the cleat up with that mark. It will most likely be the right setting for the ball of your foot. That is the starting point. As you ride you may find you want your foot further forward or further back. That will always be a personal preference.

Other pedals to consider

http://www.amazon.co.uk/s/ref=nb_sb_noss_1?url=search-alias=aps&field-keywords=shimano+spd

I use these on my touring bike and have been really happy with them.

http://www.amazon.co.uk/Shimano-Mountain-Pedal-EPDM424-Black/dp/B000KBZUFO/ref=sr_1_9?ie=UTF8&qid=1358610129&sr=8-9

I use these on my mountain bike and like the platform in addition to clipping in.