I would go with Plan B. One week is long enough for me, and I'm like you, given a choice I'd rather go twice instead!