I didn't add any edge loops to round the angles off because I did kind of want some angularity there. You are correct that the geometry was totally unorganized, however, and that the existing edge loops did need to be rotated. So, here we are. The wing tips are still somewhat messy as well, but...whatever.
UV time.