See this: insert a relative waypoint before the terrain waypoint with same lat/lon and a height within rangefinder range, safe for barometer control (may be down to 2-3m), editing the waypoints file.
Video. Observe the vertical transitions.