Martian Manhunter is one of the most C.I.S ridden characters I've ever seen to be honest. That being said, his pretty damn effective when he wants to be.
Anyways, Thor wins. Intangibility is useless. His biggest asset is his telepathy in this fight. Due to Thor's inconsistency against it I'd say John should be able to squeeze out some wins with it.