If you are happy with your present system you don't need to change anything. The reason to add a pre/amp or integrated is for the HT passthrough feature. You could then run your two channel sources through the new pre/amp equipment instead of the AVR. For the HT front left and right you would need a pair of interconnects to run from the pre/out L&R of you AVR to the new two channel set up so you can watch movies. Then you would connect your turntable, streamer/DAC etc to the analog "in" connections on the new equipment. Not sure about Yamaha but some AVR's convert everything to digital. So you could run HDMI from your Oppo to AVR for BlueRay movies and use the analog out on the Oppo to play CD/SACD on the new equipment.
The new amp would be a two channel amp and power the front left and right speakers unless you really changed things by getting an AV controller with a new multi channel amp like for example: McIntosh. A very expensive solution.
Another option to try and improve the sound quality could be to get a more expensive AVR with an in home, risk free trial. Hope I have answered some of your questions.