Some good news in brief....
1) I flooded the bottom of the gas tank cap with WD-40, and the 2nd wing sprung out. So it clicks into the tank now.
2) I gave the tank a thorough cleaning (garden hose water flush, hot water rinse, shake with ice cubes, vinegar+salt soak for a few days, neutralize...