More planing and bigger equipment seems to be the objective.
A 9 m2 sail (ncx 9.0) on a slightly larger board should work out well. The Futura 133 is probably a good pick. But then the jump from a 9.0 to a 6.5 is going to be quite big. The second smaller sail should maybe be a NCX 7.0.
As your spot is very gusty I don't think that the Glide 8.5 will work out that well. Those sais are according to tests best suited for stable lightish winds.