Plan B: kick the bootloader down the drain. Use an ISP. The bug searching for the bootloader costs to much time. In addition the ISP will allow to keep the serial monitor connected while uploading.
I did not use the bootloader for almost a year by now. I definitely do not miss it. Gives me a little bit more free memory and higher upload speed as well.
Udo