Okay, I think this will solve it
https://github.com/discourse/discourse/pull/4485
I wrote additional tests (and verified the existing ones still pass) to verify it returns the Top redirect when it should since I’m still struggling to recreate the workflow consistently using the UI.