Novel way to approach this problem. On projects in the past I just kept a table of optimal angles (given the boat's performance characteristics) and when there is significant overlap I adjusted the velocity. This approach does a better job approximating wind though.