My thoughts:

keep it to just one weekend and an extra day or two
keep it as a full round the world race
speed it up a little (fewer requirements to fly slow aircraft, and more opportunities...