I may also try to flash Katapult using a SWD programmer to make Bootloader offset, USB pins, and baud rate a constant.