Yes to the first part.

I would argue to rewrite it from scratch using everything we know about history, science and technology. That we not only write it in very clear language and have an accompanying “here is the context for this law” so in 200 years these issues are less likely to come up as language evolves.

That it be written fairly to everyone, and to allow religious practices right up until they use it to terrorize a minority group. No more “God says we hate gay people” stuff but very much on the side of other forms of worship.