I was recently on an amplifier quest myself. If I was in your shoes I would begin by upgrading my amplifier first and when I had more money upgrade to a separate pre/pro.
You didn't mention your budget for an amplifier only for a new receiver. I would recommend increasing your budget to ~$1200 to get a nice amplifier with balanced inputs and 7 channels so that you can accommodate future upgrades (or you can bi-amp your fronts).
Emotiva receives a lot of praise around here. I had a bad experience with a very nasty sales rep about 2 years ago when I was a prospective subwoofer buyer. Needless to say they lost my business for life. Others have had great experiences so don't let my singular experience deter you, but they will not receive a recommendation from me.
I would hit the used market to find an amplifier:
If your budget is around $800 (per you receiver budget and is not increasing anytime soon) I would pick up a Sunfire Cinema Grand 5 channel amp used. You probably could find one for around $700.
If this Arcam FMJ P7 stays low (http://www.ebay.com/itm/Arcam-FMJ-P7-Multichannel-Theater-Surround-Amplifier-/330866538788?pt=US_Home_Audio_Amplifiers_Preamps&hash=item4d092eb924
) that would be a steal at any price sub $1k.
If your budget has some wiggle room then you should consider:
Also please use caution with your current amp, if your are indeed under powering your new speakers and your amplifier is clipping they could be damaged!