Ok.. So now I'm royally confused. I presume I'm just working myself up over nothing and just confusing which calculation method I should be using.
Drawing a vector diagram, I would come up with results, boat:10 km/h south, wind:8 km/h east, and resultant:13 km/h, 39 degrees, east of south...