It is a tough question to answer and you will likely be getting subjective opinions because for people to offer relatively objective opinions (yes, still just opinions) they would need to know more about your needs, such as room size, listening distance, how loud you typically listen to, do you believe in being able to hear differences in sound quality that are probably not detectable by most people especially when the prepro/amp or AVR are not the weak link in your system, and so on.
Anyway, just food for thought, I went from AVR with preouts + a 2 channel amp to prepro + MCH amps but if I were to do it again I would likely go back to a mid high range AVR such as a Denon AVR-4311/4520 plus just a 2 channel amp. As it is now, my prepro is an AV7005 and my logical upgrade path would be the AV-8801, but that thing costs $3699 (economy of scale effect?). So the advantage of an easier upgrade path for separates is really elusive in my case. Had I gone the other path, I would just wait another 6 months and pick up a 4520 for under 2K. It is something that sounds good on surface, but not really as good in substance, due to factors such as economy of scale and limitations in available options.