I was planning on taking both but imagined I wouldn't be the first person in this position. There's long enough on the valid one to get back to Doha and change my RP to the new one before I travel again.