These are some very quick thoughts as I have to go soon.
I agree with Fiah's borders, these also seem more natural, following a cliff.
I'm also not so happy with the border following the road, and with the docking extension the borders would look a bit strange. If Canyonlands aren't important to you, I'll suggest these borders to consider, giving more land in the south instead that includes the entire mesa.