Not seeing how the offset would help. You'd still have the fleet crossing the course to finish from B, and worse, it's a one-way parade down the whole length of the course. B-F (at the starting boat) simply does not work for trapezoids.
Rick, most of the traps I've seen used are essentially inside-outside loops, with all boats finishing on the left side of the course somewhere (like John W's posted SIs). That is not what you want with Waves and spinnaker cats, so we have to think outside the box a bit.
I think you're basically there. There are going to be limitations, because your primary focus is to separate fleets for safety. Finishing the orange boats at their gate and the yellow boats at the starboard side of the signal boat is probably the best plan, because that will also allow you to have starts as fleets are finished (without waiting for everyone).
But of course, it's a balance. If you push to start the spin cats while waiting for the yellow boats to finish, you will have mixed boats on the same side of the course again...
Mike