I use Ctrl+R chronically for the same thing.

I've been loving mcfly[0], a history search that can be bound to . It makes suggestions based on your current directory as well as your command history.

[0] https://github.com/cantino/mcfly