If the warm up time bothers you and you were happy before you made the switch you are not a tube guy. I've had both, have loved both but am solid state (NAD, no less) now. Either a c370 or newer or one of the other options mentioned above will probably help get you back into the music. And that's all that matters, isn't it?
Also, don't forget to look at the higher end NAD's if you are moving up the price ladder.
Also, don't forget to look at the higher end NAD's if you are moving up the price ladder.