Not having HD, and 16xx numbers being used so long, I prefer to keep Intrepid as 1631, Excalibur as 1664, etc. It also fits my favored theory melding the hull numbers and sources. As Baton Rouge starships refit to Connie specs, 16xx works, with the FJ numbers being the intended replacements. So when 1664 Excalibur gets scrapped after the M5 incident, 1705 gets built.
But if we go with 18xx, then FJTM is just wrong, and Connies are potentially spread out from 1700 to 1897. It also means Reliant inherited Excalibur's hull number, and that different designs are even more interspersed than previously thought.