I think the votes are unanimous.
Jeps, definately do the PPL flight test. The gains far outway the week you'll make up in time. The most valuable point is flight time under testing conditions. There is a huge difference between requirements for a GFPT and CPL test. That goes without saying. The point I'm trying to make is you will gain alot from the PPL flight test. A big one is you'll be seated next to an ATO for a lot longer than an hour (such as GFPT). PPL test will put you in good stead for CPL test as they're both Nav's for a start. That extra amount of time will allow much more feedback from the ATO which may make a difference come CPL testing time.
Good luck
MP