You could try tipping the fin back 4 deg. (not much at all).
Tighten the rear fin screw until you get the 4 deg. rake (measure it with a
protractor) then snug the front screw and take it for a sail.
This will tell you if your upwind issue is the fin rake......or...