My vote would be to get the better speakers that you like the sound of, and to not worry if your receiver is a little underpowered. Just listen a little softer!
Seriously, better sound at a slightly lower volume is going to be more satisfying to you. Plus, speakers are a longer-term investment, since electronics get obsoleted quicker. In a year or two you will want a new receiver anyway!
It is also true that you will have plenty of power for 2-channel listening - the limitation will be for 5/6/7 channel listening. I think you will have reasonably good ability to blast tunes (2 channel) for a party, even if you can't shake the walls while watching a movie. Heck, in my college days I had a 60 wpc amp, driving a pair of Large Advents, which are pretty inefficient. It played plenty loud.
One more suggestion is to keep the impedance switch of your Yammie receiver set to the 8 ohm setting, regardless of your speakers' impedance. This allows higher power output on any individual channel before clipping. There is a little more chance of overheating when all channels are being driven, but avoiding clipping is more important.