That's my dilemma, also. I drink caffeine-free Coke (NOT diet, regular coke). We always brought a 12 pack on of that for me to drink. I hate (yes, I'm saying "hate") that HAL has changed that policy.
Yes, you cannot bring sodas onboard now. Although I've seen reports that people have be able to do so in a port stop, but not on embarkation.