Class A Integrated amps

I am currently running a class A Fisher 800 C receiver and a Pair

of Large Advents.  Very happy with this set up but feel I am missing out.

I am planning to up grade with Marantz integrated amp and Klipsch forte lll or lV.  
Cant seem to find info on Marantz equipment that says they are class A.  
also not sure if I should concentrate on a 7.2 Channel a for surround sound. I really just like to immerse in good fidelity with music and a glass of wine.