Unfortunately there are a few bad tutorial videos out there and they refuse to update them with correct mapping techniques. So here we are scrambling to correct new mappers as soon as they show up on the scene.

Thanks for getting back to me. I'm happy to help correct bad habits. It will make my life easier in the future.

You are right that the previous way the fairway/green was mapped was also incorrect. At some point, I will work on correcting all existing ones like that (in the US). In the meantime, I'm pointing them out to new mappers. 

You can absolutely go back and edit your fairway. Just pick two nodes on the fairway that are near the green. I think you have to shift-click to select two. Then you can right click and split the way into two ways and delete the one entering into the green. At that point, you should be able to continue drawing and snap to the boundary nodes. If that doesn't work, undo all the way and try deleting single fairway nodes that are inside the green and then just drag nodes until they snap to boundary nodes. (I really should make a video of how to do this. It would be easier to explain with video.)

third option: leave it as is and I'll get around to fixing it myself this year. I have 13,000 other fairways to fix and the goal is to finish them by the end of the year.
