I think everybody is forgetting something.
Does everybody remember when Luffy was thrown in water? (Arlong!:eyeroll)
His ability was still activited after he was in water!!! (his neck could still stretch!)
Thus, we could conclude that Marco is still in fact change because his fruit is...
