Mort, great move, welcome back, you are going to wonder why you stayed away so long

I'm similar weight to you and got back into it in 2006 after a 23 year break. The gear just keeps on getting better! I remember Fred Haywood trying to crack 30 kts, now I can crack this on regular, middle of the road gear, with middle of the road talent

My 70+ year old team member has cracked 35 kts!!
One big difference is that board volume is no longer the definitive guide to wind strength. I have a 125L freeride board that I can sail on the Swan River in 20-25 kts. Plenty of guys our weight are wave sailing with 90-100 L waveboards that get them going early but still carve it up on waves.
Consider a spectrum with maneuverability on the left and speed on the right and the marketing terms are
Radical wave
Onshore wave
Freestyle wave
Freemove
Freeride
Freerace
Slalom
Speed
Then you have some other types such as freestyle and all-rounders which don't quite fit that spectrum.
Sails follow a similar pattern.
For onshore conditions around 18-20 @ 83 kegs, you seem to be on the money. Start with a floaty, onshore oriented board with a 5.3-5.6ish sail. There's a huge variety of wave sails from 3 batten to 5 batten. Typically the onshore sailors favour 5 batten for range and stability, whereas the down-the-line cross-off conditions may favour a lighter 3-4 batten sail.
The great things is that you are VERY unlikely to find bad boards or bad sails post 2010. It will all come down to personal preference.
Enjoy!!!