Iron Fist and Shi win. In terms of pure martial art skills the two of them are pretty much paralles to Shiva and Dragon but on top of that they both can amp up their states with chi to near Spider-man levels (and that is excluding the Iron Fist). It's pretty much a clean sweap for the Marvel team, even with out chi amping I'd give then the slight majority.