I'm in the get the right chain consensus on this. Take the chain-width numbers with you to the shop.
I'm curious about the chainring warpage thing though. How do you cause that? Crash? Torching on a bottom bracket? It seems like a warped chainring, (or for that matter if the whole works were somehow out of "true" which would show the same symptom), should have audible differences in the sound heard as the crank rotates and the chain touches the big ring; chain contacts outer ring, then doesn't, then does again, as you pedal. Or maybe the noise is always present but alternates louder-softer-louder.
My $.02 from a non-tech.