Affordable integrated amps with HT bypass?

I own a Rotel RA-1062 integrated amp, a Rotel RCD-1072 CD player and 3 pairs of B&W DM 602 S3 speakers, NONE OF WHICH HAVE EVER been out of the box since purchased. (LONG story)

I LIKE the way this combination sounded when I demo'd / auditioned.

I'm finally ready to set something up in my living room.

The key is that I want one system setup for music and movies, with music the priority.

The Rotel amplifier I own is supposed to be very good at the price point but does not have HT bypass.

The newest integrated from Rotel is also supposed to sound very good but it also did not come with HT bypass.

I want to have both music and movies but I don't want to go with a one box solution because I understand AV receivers don't sound so great with music when compared to even a budget high end integrated amp.

Plus there is the issue of trying to cram too much into an AV receiver, lowering the quality of everything and the likelihood of something breaking.

Should I start over, looking for an integrated amp, that sounds good paired with my speakers and has the HT bypass feature?

Or should I keep what I have and switch speaker wires back and forth between the integrated amp that I own and like, and whatever AV receiver I end up getting, every time I want to switch between listening to music and watching a movie?

Thanks in advance for any and all advice that comes my way.