Ben, I assume you are looking for some honest feedback.
1st, go back to your 1st idea. I don't see the fairways being any less safe than the second option. I hate to say it but that option looks like a sell-out. You show some exceptional thinking to go with cojoined fairways to make a small site feel much bigger than it really is.
A couple observations,
As mentioned, #1 with OB and range tee right not good, Consider switching 1 and 9. This would required flipping 6/7 and 2/8 but that gets rid of the parallel same direction holes of 9/18 and 6/17. Of course 6 would become 2, 7-6, 8-7, and 2-8.
Cut the left trees off #13 tee, don't create a chute. This gives slicers somewhere to start the ball and let it come back to the fairway. Otherwise, they are forced between the trees and end up in #17.
Not a big fan of water left/OB Right setup on #3. If the wind comes from the SW, it's pushing slices OB. If you need a lake for irrigation, it looks like around #11 is available. It looks like you are trying to use the water on 3 to protect the 4th green. Having 2 of the 3 water carries on sucessive holes then not again until the last shot is disjointed. I don't know what those contour lines are (meter/quarter meter?)
Consider rotating greens to tees and tees to greens on 5-6-7 to get away from the awkward circulation of 16 to 17. Having #16 green back up to #13 green.
If you do stay with the bowling alley-like single fairways, try to do something to get away the straight back and forth holes in the middle. Put some curves or bends in.
Just my back-of the napkin review. I know that there are probably many constraints I ignored and didn't have the benefit of scaling it all out.
Cheers