Hey Jim
I have the same issue at my home. Are you on public water, if so have you eliminated your water company? Also you said it is the worse on your second floor, mine also. Does calcium float if so this would explain it traveling to the highest point in our water lines.
Also my home sit's on top of a high point in my neighbor hood, higher than all my neighbors and they don't seem to have this problem.
Thanks