That tube socket is the correct part. If you look at the top side of the socket, there are two pins that are obviously a bit fatter than the others.
If this is tough to see, then you can take one 4 pin tube out of its box, note which pins are the fat pins, then look for the only way that the tube will fit in the socket.
As far as the hum pot goes, we ended up changing parts somewhere along the way. There isn't much harm in those two touching, but if you have a file laying around, you can file that choke mounting tab to add some clearance.
-PB