Thank you for your thoughts, guys.
This is rather my error than USCIS's.
The attorney came up with a primitive solution - file I90 for a name change, pay $325, and wait at least 5 months. This would actually put me back in security check, I believe. Thanks, but no, thank. The attorney's...