In reply to A Adams.

Same here. I'm strongly considering just forking WP and backporting any fixes from 5.0 for this scenario.

cu, w0lf.