OK, thanks to NinjaHamster and rb2013 for the advice. I managed to get them out fairly easily and switched them around. I also put even more Deoxit Gold on them and reseated them. I also made sure the tubes were in the socket savers real good. That was only a few minutes ago, but so far no noise at all.
A few minutes into listening: I think the sound has improved a bit.