Ignorance is bliss..... took the bike (2012 F800GS) in for annual service. Happened to park next to a guy and we got to talking. He told me he was having his tank replaced. So, he looks over at mine and says "looks like you have the same issue".
Dealer confirmed and has replacement tank on order.