It really comes down to how many people intend to play during the season. If it's a small number, old F1 points. If it's in the mid-to-high teens, then current F1.
The real shame last year was that the championship was effectively decided before the last race, when 10 entrants, and everyone thus scoring points. If we don't get 15-20 guesses each round, we'd be better off just giving points to the Top 6. Also, that would mean that if you make a snowstorm theory-guess at Abu Dhabi, you won't get any points, as you don't deserve them.