Here's a few more recent sessions.
This is at North Palmy. Is anything the sweep is going downwind. I was basically wave riding, but you can pick a few of the upwind legs in there. Angles are quite good IMO, probs about 60degrees.

And this one is an upwind run I did on Pittwater. From Snappermans beach to Bayview. This wind is extremely hard to get good ground, especially near Scottland island. The Furthest points were 6.7km apart. These angles are not as nice as the wind knocks all the time.

Here is a coastal run from Longreef to Newport reef. Upwind then DW. Angles are pretty god here also.
Being nicely powered makes a huge difference. But also not using too big a Wing-surfer to Foil size otherwise you're going sideways.
In general, not much overtakes me upwind.
Ride safe,
JB