I like to format my code in ways that make it more readable, too. Vertical alignment is one way. I'm familiar with the arguments against it, but it always seems to come down to the limitations of source control tools.

My half-fix: make functional changes in one commit, formatting changes in another, with a simple comment, "formatting".