Good work. IMO, an out-and-back is the way to do it.

I've got a buddy that brags about his 20.4 mph moving average on one of his 30 mile rides, but he only rides it in one direction...the one with the tailwind.

Bob