They should just go ahead and follow through with the Bobby Martinez Tour recommendations... turn it into the World Surf Tennis Tour, and follow the Tennis format for points and who is number one.
That, or maybe an F1 approach where brands pick two surfers (drivers), and a back up, to form their team. Have shapers championship points as well as podiums with top 3 at each event.
Whoever reaches years end on top, wins, same as for the "builders" (shapers) champion.
Couldn't go any worse than the current finals format. Which, IMHO, is a total sham.