I agree that the 2-move scramble is a problem, but the problem goes much deeper. As the years go by, singles will be ruled more and more by luck until, theoretically, 1000 years from now, if the Earth still exists and cubing still exists, it would take billion-to-one luck to get a single record. Sometime between now and then, either single records will be ignored/eliminated, or a new definition of a single solve will have to be created. For example, the person's single time, in seconds, divided by the minimum number of moves that it takes to solve the scramble. So if you pull off 3.01 on a scramble that has a minimum solve of 20 moves, your 'score' is 3.01 / 20 = 0.1505 seconds/moveminimum. If someone did 2.82 seconds on a scramble that could be solved in 4 moves, their score is 2.82 / 4 = 0.705 seconds/moveminimum, with lower 'score-times' being better.
Another method would be to 'normalize' the time by the ratio against God's number, so if the scramble needs 20 moves to solve, no adjustment is done, but a scramble with a 10 move solution has its time doubled.