I'm surprised no one has yet mentioned Eshell has a module built in for exactly what you want, you just need to `(push 'eshell-rebind eshell-modules-list)`. Now C-p, C-r, etc. work as you are used to.