(Not really a contest pilot here, so read with a grain of salt.)

I can see that the rules make the game and the current rules might encourage some folks to be unsafe. A hard deck data base with penalties seems a possible way to help this, but getting the details right for a hard deck database seems problematic if it is not to significantly limit strategy options.

Perhaps a simpler alternative would be a list of designated landing sites for a contest day.

Penalties would be accessed for not always keeping at least one under you according to some simple equation. (Perhaps looking at only L/D, minimum energy over terrain, and safety altitude.)

The goal is to not fix everything, but at least nudge strategic thinking in a safer direction.