Yesterday the angle you where sailing off the wind was fine, maybe run off the swells a bit further in the gusts and head closer when the wind drops.
Can't remember whether you are running adjustable outhaul, definitely helps- to be powered up enough for the angle off the wind you should be maxed across the wind, so pull it on for normal angles then bang it to negative off the wind then each run you do find the setting where you are most comfy.
Fin size yer what vando said or maybe even more- it is dependant on how free the course is, though it's nice having a nice small fin off the wind but you gotta be able to sail back up. At burrum or lota you will find the board creates alot more lift so might have to move mast foot another cm or 2 forward. Oh and when you are sailing those spots go as close to the bank as you dare and then some.
It's good to see you back on the water, now it just takes time