Using alternative Arduino pins for XBee Shield

I have an Arduino UNO R3 and the XBee shield. I would like to use different pins that the default (2 & 3) on the Arduino so that I can use 2 & 3 to handle interrupts from an encoder. I have done a lot of searching online and found that I need to break (desolder) the two jumper pads inbetween the XBee radio and the digital pin bank on the shield. I then need to connect my digital pins 10 and 11 to somewhere on the board. Right now, I see that there are two choices. The first is to solder pin 10 to the left side of the jumper pad that I desoldered for pin 2 and then pin 11 to the left side of the jumper that that I desoldered from pin 3. The second option is to directly solder pin 10 to the DIN and pin 11 to DOUT on the XBee (using the shield XBee module breakout. Which of these are the correct choices?