stevemarple:
I think we're both using Ryan Sutton's bootloader, with maybe some minor mods?
Yup. Well, I was when I wrote that 
Now I moved over to Optiboot. 115200 baud and not a single error all night. So far so good! I'll post the patch as an issue on the optiboot site after a bit more testing.