News:
There ya go. Don't forget to save the pad on the top of the tank; they're not properly re-popped the last I looked. Fun, eh?
I am not the OP. Just want to share what I did and option 1 seems to be the way to go. In case the OP has not decided.