Surfing Waves

Hi
I live in Brisbane and surf at the Sunshine Coast. I am a 45 year old tamale, very fit, 163cm and weigh 63kg.
I have not surfed for many years (and when I did it was mostly in whitewater). I have an old 6" short board that I can mostly pop up on, but find it hard to paddle and catch green waves as the takeoff is too quick for me on this board.
I am looking at buying a mini mal 7"2 or 7"6 with a volume of about 50 so I can have fun in the water and more or less begin again. I have been recommended a NSP funboard or an aquatic social scene 'devocean' poly board.
Anyone go any thoughts on which size or board would be better?
Thanks

Is a longboard out of the question? There are some days when I'm just looking to cruise....plus if your experience is limited to mostly whitewater like you said, a longboard will help you develop and get you up and riding a lot sooner....take it from another 45year old geez; there are some days when you're not 100% and you'll be thankful for the bit of extra paddle power, leniency in positioning, of slow takeoffs, of semi-blown timing.....and you'll still get waves and decent rides.....longboards are not limited to small waves....I think everyone should have one in their collection....you can always add to the quiver...get a good one and hold on to it.