Castillo closed the distance with a better counterpuncher than Marquez in Floyd and arguably beat him in their first fight. A prime JLC uses his size, strength, and vastly underrated boxing skills to smother Marquez, punish him on the inside, and earn a close win in a Mexican classic.
Pound for pound JMM is better than Castillo, but above 130 is simply not JMM's best weight, so I will pick Castillo.
Marquez does get hit quite often, the left hook seems to be the shot that Diaz and Katsidis caught him with. I'd have to go with Castillo by stoppage here.
Castillo by TKO. JMM isn't good enough or sharp enough at lw to beat a technical pressure fighter and body puncher like JLC. He'd find himself on his ass and would be worn down by the bigger/stronger man.