Bugs in word circle drawing

[adrian17]

When the B-row or T-row letter circles start crossing wich each other, the word circle stops being drawn correctly. This happens because the end points of the arc get flipped and the arc goes around the whole word circle.

I tried fixing it once, but failed due to angle difference calculation confusion :/

[Wolf-SO]

The problem still appears, if you place a t by hand and it overlaps with an adjacent t, you'll see it.