need new seperates on a budget

My Marantz receiver just died so I am now looking for a set of seperates to replace it. I want a 5 channel amp and a processor or more likely a new receiver to act as processor. The problem is the budget is limited to about $1600 for both. Any suggestions, am looking at arcam p1000, sherbourn, theta intrepid, parasound, b&k etc but have no idea which would be better. I listen to music in 2 channel about 75% of the time. Really concerned about the pre/pro. I have Focal 806V, Elan surr and Energy center but just care about the Focals.