Inn
Action - $5
+2 Cards
Discard any number of cards, +1 action for each card you discard this way
---
When you gain this, you may look through your discard pile (including this), reveal any number of Action cards from it, and shuffle them into your deck.
More variety, and more thematic on top (the more "time" you spend at the inn, the more you can do), and the bottom cuts down on unnecessary shuffling.
I agree it would be fun, but probably way too powerful. The ability to get lots of actions in a draw-your-deck engine... 1 or 2 of these, and you don't need any other Villages. Also, simply +2 cards, +1 action, Discard a card is probably pretty good sifting.
When are you shuffling unnecessarily though? If you don't add any actions to your deck, and you didn't have any knowledge about the order of your deck, then you've already successfully shuffled before your first riffle... the definition of shuffling is randomizing your deck so that the order of cards isn't known. That has been accomplished... no one I know of would ever force you to actually shuffle redundantly in the situation, you've already met the requirements.
Farming Village
Action - $2
+2 Actions
Reveal cards from your deck until you reveal an Action or Treasure card. Put all the revealed cards in your hand.
It's simpler, more interesting and slightly more thematic.
Um, that Farming Village is a good bit better than the regular one, and costs way less?
*Edit* I see you fixed the cost. I still think it needs to be a $5, though.