What is all the talk about 4 wire from the panel for? He has 240v in his box, his main plug has two hots running to a 2 pole breaker, one neutral leg running to a terminal strip, and a ground.
Your L6-30 outlet can be rewired, no need for a new outlet.
Like I said earlier, just replace one...