For the eventual 5 Gbps: the big question becomes your WAN handoff type from Atomic/ONT. If it remains 10G copper, you’re fine. If they offer 10G SFP+ (fiber) handoff, that’s often even cleaner (less heat/power vs 10GBASE‑T), but your current arrangement sounds solid either way.