Why are you limiting yourself to these two combinations?
If you want the best at a given budget, why not list all your current equipment in the virtual equipment segment of this forum and provide a budget?
What will you do with the advice that you receive? I ask because if you do the above you will get a diversity of suggestions. How will you go from there? Otherwise buy either of the ones that you suggested because few people here have heard both combinations and without hearing them, what value is their opinion?