Not really had many crashes with librepilot GCS but i cant get it flying anywhere near as good as dRonin after using there autotune.
Ill have a play around, im sure what im trying to do is easy when you know how.
I tried starting from a fresh clone of next and going through everything above, then replaced the 2 files with the conflicts with the ones you attached. When i try to merge now its telling me the merge will override the changes ive made to they 2 files and i need to commit them.