I like this much better. I'm okay with keeping the "sober mind" phrasing as it is. It reinforces the voluntary nature of the oath, but I would also understand if people want it removed.
To ask a stupid question: this wouldn't force citizens to retake the oath, correct? All existing citizens would be grandfathered in?