I think the Fast Average section might be modified so that instead of jumping to the spurious noise point, it will reject the sample entirely.

That should only take commenting 1 line from the original code.