Start with the replacement modem.
Because you already have an SSFP fitted by the installing engineer that negates the possibility of the
Internal wiring modules having to be checked/charged for.
In fact the CP has various options over which modules of the SFI visit they wish the engineer to check. For instance, if they don't state the 'end users equipment' module then the SFI cannot claim to have tested that bit, and Openreach can't Bill the CP for it either.