if ur not applying this year..then definitely retake before May, so that way, u can apply immediately (may 16?) and ur scores will be all ready to submit..
key is be early!! wish i told myself that as a reapplicant..
but congrast on finishing ur dat..ur pat/rc is great! but sciences are just as important too..try to shoot for the 20's..good luck!