The NAD won't be enough. You need more. The best I have heard driving 3.6 is Classe CAM 350 monoblock. It has been discontinued. They sold for around $7,000 new so you should be able to find them used for less than half.
Now I think about it. You might be better off keeping the 3.6 and getting a new amp than moving to 20.1. Your 3.6 has been under-driven. You have not had a chance to hear what it can do yet.
Now I think about it. You might be better off keeping the 3.6 and getting a new amp than moving to 20.1. Your 3.6 has been under-driven. You have not had a chance to hear what it can do yet.