Wokks, you were right on the Volume pot as well. Originally, I had bent back that right lug to earth it and soldered that connection as per diagram. Turns out it wasn't a good solder or not enough connection with the lug to the back of the pot. I re-soldered some push back wire to lug and back of the pot this morning. Volume is good now.