I've been using the lady adafruit bootloader for seems like a year now on all my 328 setups. It handles WDT correctly and seems to have a very short bootloader time out, sketches seem to start instantly on power up.
What is the timeout period of optiboot and does it handle WDT interrupts correctly? I'm aware of it's biggest advantages, smaller size and faster baud rate.