A couple of months ago our street in New Plymouth was half dug up and half wired aerial ready for fibre, and according to www.ultrafastfibre.co.nz our address is now fibre ready (1st Nov).

But before I sign up and get the install, I wanted to get some opinions on things like where to put ETP/ITP/ONT, and how to future proof our house wiring (which we own).
As in a few years time (3+ years) we may sell and move to a bigger house.
The house is a 1950's house that was extensively redeveloped and reclad 7 years ago (previous owner), unfortunately instead of nice structured cabling, they put in cat5 cable in a daisy chain to each phone jack!

Here is the current setup diagram: (not drawn to scale, office shown much bigger)
Key:
- solid blue lines: 2x cat5e cables I installed from 2 RJ45 jacks in office, through to 2 RJ45 jacks in lounge. I installed these 2 lines, so I could connect devices in the lounge (AV stereo, PVR), and connect back to switch. Managed to pull up through office wall via old existing speaker cable (as office is on concrete pad)
- dotted green lines: daisy chain phone line, cat5. currently only used to connect adsl2 modem in office.
- all of house is on piles (access underneath) except office which is on concrete pad
- office doesn't have a 'comms' cupboard, just devices sitting on filing cabinet



Questions:

 

1. Should I install structured cat6 from a central point (perhaps corner of garage? or some other point)
   Would this be beneficial for future proofing the house, either for future data usage, or for future owners?
   Or is the effort not really worth it when selling a home?
   
   
2. Where should I request the fibre ETP, ITP, and ONT be setup?
   I guess the easiest would be just trench from power pole directly to office wall, and install ETP/ITP and ONT in office?
   Or perhaps get the ETP/ITP in the corner of garage, and run 1 cat6 cable through existing conduit, under house, and to office, for the ONT?
   
   
3. I currently don't use the daisy chained internal phone (cat5) wiring (green in diagram above), should I just leave this as is?
   Instead I use a SPA122 in office (with 2talk), connected to a panasonic cordless phone & base, and another single panasonic cordless phone in kitchen (talks to same base in office, hence no need for wiring)

Not sure if its ideal to install a comms cupboard / shelf in office, as its just a plain approx 4m x 3m room (no cupboard)? We do have a storage cupboard off the entry, but this has no power points so not ideal.
Only other thought was the corner of garage, but is it ideal to have the ONT there, along with NAS, switch, SPA122, etc? Or perhaps if it was there, could I then wire the SPA122 back into the house daisy chain phone line?

Keen on anyone's thoughts/suggestions, thanks.