Hello Thomas,
Could you provide more information about your process of upgrading bootloader and firmware as it's usual solution to restore device from safe mode is to update bootloader and FW.
First it's needed to upgrade bootloader, it can be done by following wiki instructions.
After upgrading the bootloader newer FW versions will be supported, FW can be upgraded via bootloader menu as well.