Your second paragraph looks OK.
To me, it doesn't look like your first paragraph changes are any clearer than the original version. This may be a situation where one way of saying something is clear to you, and a different way is clearer for someone else.