Just sold my old Naish 11'6 as it was one of the first off the line and a bit sticky etc etc

So I need some advice as I haven't been out all winter.
90kg and I want something for flat water and surf.
I'm good in knee high surf, average/crap in waist high and obviously fine on the flat.
Was looking at the Naish range again or the Starboard range but open to suggestions.
Thanx in advance