[peanut]

I think by then you'd have upgraded to a newer amp/av where everything is HDMI, then it's just a case of using a bit of common sense.

I take the amp is a music amp and not an AV amp. It also depends on the age of the equipment. But it does looks like you've got it right as it is.

Otherwise if you use an AV it is, all speaker to AV, Tivo to AV, CD/DVD/Bluray/etc to AV, then AV to TV.