I'd make people rape-proof. They still have free will and can want to rape all they want, but won't be able to do so. It would no more violate their free will than not being able to walk through walls does.
I'm not anti-Christian. I'm anti-stupid.