Upcoming Move - Questions Ethernet Cable, Modem/Router, Ethernet Run & Electrical

My head hurts thinking through the options and alternatives I am facing in moving my audio system into a home we are remodeling a few hundred miles away.  I will be moving all the components myself.  I would really appreciate your thoughts on an efficient set up that does not impact the quality of my system and especially the digital steaming.  I am pretty well dialed in at my present location with a large AV closet ( 12'X10' ) that is heated/cooled and has the internet coming in with associated wiring for the modem and router.  

Quick overview - I have in the new home a good location for all components determined . The electrician is putting in a dedicated line/outlet thats a few feet from all the devices - amp, preamp, streamer, DAC, turntable, various power supplies for devices, power strip and surge protector.  There is a 15' wall with bookcases built in on either side and a large window in the middle.  Under the window and connecting the bookcases is a built in bench seat with accessible storage space that connects to either side and it has a hinged top - so I can run cabling the length of the entire wall that is hidden.  The speakers will be around 12' apart on either end.  With this setup the internet line is coming into the bookcases on the right side and that is where the present combination modem/router is now located.  On the far left side wall by the bookcase is where the new power/outlet is being run ( due to access to the panel downstairs ) and where I will have a wooden three shelf rack for the components.  Hope this helps you visualize the setup.  

Option 1 - Since the modem/router supplied by Xfinity is on the right side I could run a new 5 meter ethernet cable from it under the window seat and out of the cabinet where the new power will be and the streamer and DAC will be located.  The new ethernet cable would run it into an ethernet switch I have and then I would utilize my shorter Shunyata Theta ethernet cable directly from the switch into my Aurender 200 streamer

Option 2 - Run a longer length of internet cable from the wall on the right through the bookcases/window seat and place the modem/router on the left hand cabinets which puts this closer to the streamer and eliminates the need for a longer ethernet cable.

In either option above I believe I will purchase my own modem and router - suggestions please!  With all the above in mind would one option lead to higher quality sound based on the location of the modem/router and length of runs?  Is there a better option and am I missing something I have not envisioned.  Again my head hurts :)