Hi Pete been similar route as yourself FT 148 then Apollo 07. Have you got your Apollo yet? I find myself using the Apollo most of the time and as the wind picks up R17 S +6 is my best fin.
Recently added a 12.5 to my 9.7 for those really light wind days and its incredible how little wind you need to get going. I use adjustable out hauls on all my sails and carbon booms and masts. Everything is second hand except for the 9.7.
Just purchased Exocet Warp 80 for higher wind conditions was thinking of a 160, 162 or one of the new Excet Warp 100 formula boards but have come to the conclusion a Salom board would be better as the wind picked up.