I'd suggest replacing the old BQSR, there are still outstanding issues that affect correctness on the existing implementation and leaving it in gives a false sense that is somehow more correct.