Both proposed changes would seem more natural to me, you have my support.