You Missed The Part About Taking H2 To Mars
You can take H2 or mine water. Taking H2 is easier technologically but has a mass penalty. Mining requires additional equipment as you noted although the extent can vary significantly depending on the nature of the ice deposits. It will most likely require more than one mission to be a worthwhile investment, but surface ice (such as the poles) might be an exception to that. I'd estimate the ice processing equipment has to be less than the mass and volume of the equivalent H2 to be worthwhile on a single mission.
Even the taking H2 option calls into question the value of going to Martian moons first which was the main point of my previous post.
Regards,
Mark