Go with a better preamp. The Gray may be an improvement, but not like what a good preamp will give you in terms of music.
Upgrading the conditioner won't make the Onkyo ne more musical.
Upgrading the conditioner won't make the Onkyo ne more musical.
Upgrade recommendation. Richard Gray or Mcintosh.