Another thing you could do if you feel the Marantz is a bit slow or laid back is do a fuse upgrade. A Hi-Fi Tuning Supreme fuse will give more attack and detail to the sound, as well as improving overall solidness of the sound itself. You will have to take off the top part of the case to see what is on the main power supply board (just behind the power cord socket). Typically, a processor will have one fuse, usually about 1A in capacity. You can push this to 2A if you want a bit more punch/authority in the sound. Power cord upgrade can help as well.
It sounds like you have a plan. The decision between tube and solid state has it's own decision process. I would see if you could listen to some tube amps to get an idea on whether you would like them or not. The tube amps may have a nice texture and sound, but they will likely be warmer/slower sounding than solid-state and may lack the deep punch and power of bass compared to the large power supply of the Parasound A21. The A21 may seem lacking in the texture and bloom that tube amps have. It depends on what you want.