Update: Jimmy brought my tank to me after work. Now I just gotta POR 15 it this weekend & we'll be all done.
--Well, that's not quite true. The filler cap will need some attention and fettling, and I've still got to file away a little more 'glass around the hole. But still.