I have the same board which I use with a 5.2 or 4.7 in bump and jump conditions.
My preferred fin is a Choco Starfish 22cms. Keeps the board loose, gets planing early and is fast and chuckabout.
It's a more upright fin than the one supplied with the board so maybe that helps with upwind performance.
If you wanted a bigger size fin then the same style in a 25cms should do the job but I wouldn't go any bigger unless paired with say a 6m rig.