Where is the best place to place an optical outlet when migrating from ADSL to GPON?

Question

Computer networks

In connection with the transfer of telephone networks from copper to GPON, optics are being installed at the entrance.
Now in my apartment next to the "main" computer there is an ADSL WiFi modem, next to the switch. From them, Ethernet wiring was carried out around the apartment - on the wall there are computer sockets and wires to the second computer, TVs, a satellite tuner with sharing, 2 backup Ethernet wires are brought out to a lockable vestibule for 2 apartments. A laptop, a smartphone, a reader "roam" around the apartment and use the Internet. WiFi level is enough for them anywhere.
Now the "main computer", modem, telephone, switch are powered by UPS.
The optical socket can be brought out:
1. In the same place where the ADSL modem is now - you need to introduce an optical pitgale into the apartment, move furniture, drill walls, open baseboards, but the GPON modem can be connected to the same UPS, use the existing wiring, WiFi is guaranteed to work throughout the apartment .
2. Place an optical socket and a GPON modem in the vestibule, connect the computer network and telephony outputs of the modem to the existing wires. You do not need to do any work in the apartment - all the trouble is only in the vestibule. It is not clear whether WiFi will normally penetrate the entire apartment, to connect a GPON modem to the UPS, you will either need to install a separate UPS in the vestibule, or connect the PSU next to the "Main Computer" and forward low-voltage power through free pairs of Ethernet wires to the vestibule. The vestibule is locked, so the equipment is completely safe there.
3. Accommodation - as in paragraph 2. If WiFi does not work normally, you can switch the GPON modem to bridge mode, WiFi is turned off on it, install an additional WiFi router in place of the modem - it is guaranteed to break through WiFi throughout the apartment.
4. What other options are considerations?
I can't make a decision... And in the evening I need to do it.

Answer 1

Option 3 seems to be the best.

Answer 2

Option 3.
But somewhere I heard that GPON from MGTS is not a cake.

Answer 3

With a friend in the evening looked again all in place. We came to the conclusion: if we pull the pitgalle behind the cabinet without moving it away, we will implement option 1. If not, options 2 or 3.
We managed to put the pitgalle through a hollow plastic baseboard about 3m long behind the cabinet. The rest of the hassle is trifles. Implemented option 1.