The optiboot source code is now beyond "version 3"; the new source version has the 30k fix (plus support for other CPUs, plus some other stuff.)
The "amnesia" fix has been submitted as an optiboot issue (with patch), and SHOULD get into the official source at some point. (meanwhile, it got added to the optiboot source that comes with the Arduino environment, but that version doesn't have the 30k fix.)
Sigh. Keeping the official optiboot in sync with the arduino optiboot, and up-to-date (tested?) with some set of changes becomes essentially a non-technical issue of ... some difficulty. Not dissimilar to the Arduino issues that turn out to be due to gcc compiler bugs.