Maybe do a PR with the refactor first, and another PR on top of it with the bug fix. That way you can test that the refactored code doesn't change any behavior,

Maybe do a PR with the refactor first, and another PR on top of it with the bug fix. That way you can test that the refactored code doesn't change any behavior, and then you can do the bug fix (hopefully more easily once the refactoring is done). An that way the refactoring doesn't get dropped as not important, since it's literally a dependency to getting the bug fix merged.