Thanks all for the advice, as my first trip isn't for 3 weeks I've decided to get my RP changed to my new passport. I'll update my flight information with the new passport info and all will be well.

I just know with this place that i'll get to immigration and there will be an issue. May as well do it right if I have the time.