If I was to make the shoreline straight the boat would be on the piss!
Damn you perspective and angles!
Nope, it definately needs straightening up.
Take a look when lined up with the edge of a Window:
Boats do rock, but land doesn't so, I would always go to straighten for the horizon of the water, then if the boat's mast isn't straight, then it's fine.