Have you considered an indie Volvo shop? Before the first warranty had expired on my very first SAAB I had ferreted out a good indie shop. It's a matter of fiscal health. Once the original factory warranty has expired you do not usually want or need repairs performed up to factory standards. It's nice to replace everything when Volvo NA is footing the bill, but it's possible your tank could be repaired.

-Punxsutawney Phil