The lapping problem can be easily solved: make qualifying time no more than 10% more than the pole time. That would ensure that in a ten-lap race, no-one who has not had an off or other delay would get in the way.
The same could apply to the Mountain course races.......maybe with an adjustment to the percentage?
I still think that there is a grave risk of this year being the last, as those running the event continue to have their heads firmly buried in the sand.