6 Peak Training for Whitney!

After finishing the six speaks as training, I climbed Mount Whitney yesterday. Truly prepared me for the challenge except in two ways, altitude and gathering water. I was surprised at how comfortable I had gotten above 8000 feet up to 12,000. But the additional elevation to 14,505 for Mount Whitney was a struggle. Has anyone used Diamox for the altitude? As to the water, you do not want to carry enough water and need to gather it along the way. I was fortunate to try Sawyer mini for clean water which was great and I highly recommend it. Any suggestions to being more comfortable at the higher elevation would be welcome because I would like to plan another 14er!