Did you rebuild the FI manually?
Have you tried to "Activate" the firmware in the "Installed Firmware" tab? That is typically the resolution for your scenario. In this "Installed Firmware" tab, this scenario would show a "Running-Version" value in its respective column, and the "Startup Version" column would be empty.
Let me know if this works for you.