Ok, I also thought the visa will be used instead of the 30 day exempt. I also think the visa will be stamped 'used' so re-entry permit is not possible anymore ? (I mean although the valid to date says still valid). Think the 'used' stamp overrules that date.
OK, thanks a lot for answers so far. Think
@Tod ********
has the best option.