Foam looks good! For leak testing, I fixed rivets first, then tested, then fixed remaining, then coat-it (gluvit). Opt A as you stated.
Rivets you should replace are ones that are loose, missing (obviously), corroded, or tails are missing or low. Some can be re-bucked.
Those splashwell...