If your were just starting people might suggest wide beginner boards like the Starboard "Go" or "Start", but from what you've said, sounds like you gets tons of time on the water and are progressing nicely. I would suggest go the smallest board that you can still confortably uphaul. So obviously much will depend on your weight. Eg. at 90kg a 130litre board is super comfy to uphaul, while a 110 is possible but frustratingly shakey. This way as your skill increases you won't be left with an overly large board while wanting to go into more challenging conditions, it will allow you to take your time learning to water-start while still having the security of being able to uphaul. Eventually you may even want to go smaller but this board will still be excellent for light to medium wind days so will never be obsolete.
As for type of board, look for the word "freeride". Names like JP x-cite, Starboard Carve or Futura (heaps more by other companies but I am not that familiar with them). Freeride are pretty much your all round short board, they are good at everything but masters of nothing. They are the best board for just hoping on and having fun in the most conditions. Good for just blasting, chop hopping and small wave riding and jumping. To begin I suggest avoid pure wave, slalom or formula boards.
No doubt the others will be able to give you other good boards to research. Check out the websites and read some reviews. Oh I also suggest buy 2nd hand. You'll get more for your buck and the likelihood of you smashing the nose of your new board is extremely high with all the catapulting so may want to invest in a nose protector or glue an ugly pool noodle on the nose.
Good Luck.
PS. Might want to let people know your weight and what conditions you normally sail in, eg. choppy, flat, gusty, etc.
Nvm I see Easty asked those same questions 10 mins before me