I agree, best solution is number 1, and the Boundaries should be kept as they are as Beaker said.
less refering problems, trying to look if all the players has exited the flag station before shooting, the marshalls must focus on looking hits in the sweetspotting, and in the front players runs, before spending time discerning if all the players have steped into the field before shooting...
the boundary lines must be as now, of course, the best would be marking them more clearly, but is another fact of the game, if you go out of the field, you are out !,