Its important to know that there is actually no scientific evidence to support excessive hydration as a means to acclimatization.
Just take it easy for your first few days, take it easier if your symptoms persist. Give yourself as much time at elevation as possible prior to exertion as possible. Don't drink alcohol or do drugs, and just generally take care of yourself before and  during your trip.
You could also take EPO, or blood dope ... but, you would need a Dr for that ... well, ok, you should have a Dr for that.... Honestly, Diamox is your best bet, and its indicated as you have had symptoms previously.