Again, I entirely, fully agree with the first 80% of your comment, right up to "an inelegant solution". IMO the UA fix is the most elegant solution, and I apply it to all environmental-based damage (falling, cold, heat, starving), thereby washing out the "skill or luck" component of hit points...