Absolutely - CX's business class wine glasses don't hold even one mouthful; I guess the average pour is less than 50ml. First is slightly better, and in F there is no reluctance from the crew to refill. (On a recent mileage run to Jakarta and back I guess they happily gave me 3-4 bottles worth over the two flights.)

If you feel dehydrated then don't drink. I always match the wine with water at least one for one so I don't have that problem.