Maybe BA should just move to a US style voucher system for drinks. That way you could get service appropriate to the class of travel.
For example, business and 1st class pax could have anything they liked off the top shelf, whereas GGLs travelling on HBO fares would automatically be given whatever was at the back of the middle shelf.