Getting a new board

[Delicaus]

Hi, needing some help with selecting a new board.
I briefly surfed as a young kid and ive been bodyboarding for years and have always wanted to do both competently, to maximize my time in the ocean.
Im a 20 year old male, 170cm tall and weigh 60kgs. I have a good level of fitness from bodyboarding, swimming and martial arts. Im not a complete beginner when it comes to surfing, as i understand the ocean and how to catch waves. I bodyboard on slabs around my local area and when it reaches 6ft plus, but would like to surf in anything up to 4ft on beachies and reef breaks. I have no problem with taking a beating in the ocean. I can stand up and go left and right and surf along the face of the wave. Now i feel like im at the level where i can look to complete my first proper turn/manouvre, surf a bit larger waves on occasion and work on my duckdiving. Im a relatively quick learner and i love a challenge. At the moment im completely overwhelmed as theres so many different board types and am struggling to make the most correct choice. Any advice would be greatly appreciated, and if i have missed an important detail let me know.

Thanks!

[Big H]

What size board are you using when you can stand up and go left or right?

[Delicaus]

In the philippines, surfing only reefs a few weeks ago at about 3ft, i was borrowing a board off my boss, 6'0 x 19 3/4 x 2 1/2 shortboard with a round nose, back in aus i have been using a 6ft kneelo with no pads on it. Finding it a bit too wide and much harder to duckdive than the shortboard which was better.