Yeah, it would feel way more intuitive and fair... and it would make things way easier overall too.
I just made it to 510 feet - for once, I got a new record and lost from the lack of stamina instead of getting stuck!
(Edit: 765, with 115 stamina at one point!)