Wouldn't just reducing the block size and removing the witness discount be enough to fix bitcoin?