If you’re going to go to all this trouble, please do seriously consider pulling singlemode fibre instead. It is more planning up front, but when you’re ready for your next upgrade cycle, you can reuse the same fibre and change out the hardware on each end.