Merging the best of Survey Grid v1 and v2?

I want to propose a few simple merges of the great features in Survey (Grid) v1 and v2. Grid v2 was meant to be @meee1 's sandbox for advanced drawing features as outlined in #543. Couple of ideas from there that I think would make v1 work even better:

1) Use aircraft.xml to fill in the desired cruise speed (and eventually use it to add altitude and speed warnings inside the Survey interface)
2) (Eventurally) add the ability to make custom aircraft, just as you can make custom cameras in the Cameras tab
3) In the simple menu--break it down into Aircraft, Camera, and Mission sections, as in v2.
4) Move the 'Start From' option to the Simple tab - seems that this is used all the time
5) Landing: I found the 'Use RTL' option along with the 'Takeoff and Land' option confusing. Planes and copters default to RTL after missions are complete--right?. How about just individual checkboxes for takeoff and land (as in v2)? If you dont check land, you will just RTL.
6) In v2 the big numbers on the right pane are the ones you probably want to look at the most often--consider doing the same in v1?

Minor naming and other org
1) call the simple tab 'Planning' , Grid Options tab 'Options' ... 'Camera', 'Aircraft'
2) Survey (Grid) >> Survey
3) Consider only allowing v2 to only be an option in the beta (is this already the case?)

Start with the Survey interface, the Simple and Grid Options tabs, and aircraft.xml, then read issue #543 to understand the v2 sandbox. Because this proposes several UI and planning changes, first split and confirm the scope; done requires an agreed set of v1 changes and acceptance criteria for each item.

Written by the indexing model from the issue text.