I think the EVO 80 really is the best size for you. A newer version will feel a lot easier when it comes to planing and going upwind. The board is a
faster and just generally easier and the fin is much better too. This holds for both 08 and 09 version which are very similar. 07 is similar too, but has a smaller and softer fin.
I think the EVO 90 will be to big considering the wind strength you often get when you have waves.
Another option would be the Kode 80 (or Pure Acid 80 07-08). You will loose some of the very loose feel in turning and it will not be as easy going for front side wave riding (which is hard in onshore conditions). But the board will feel faster and for most people be easier in high wind. It's a more classic wave board.
So: For best control and feel when just sailing around in waves: Kode 80
For most "help" when trying to ride wave front side (maximizing chances of hitting the lip): new EVO 80 XTV.