In the meantime, clink (https://github.com/mridgers/clink) works well. It stays out of your way, and isn't clunky like the full shell replacements. I had even forgotten that cmd.exe doesn't do ctrl-r out of the box.