Well to answer my own question, just being back, they do indeed seem to cater for everybody again.
Hot catering both ways. However, don't get too excited about it. They have cracked the problem of managing separate child meals by doing the child meal for everyone ! Sausages and baked beans on the outward, sausages and mash on the return. However I did pay less for the complete holiday package than I pay for a return LHR-GLA on BA, where they now just give a bag of crisps !
Other than the hordes of screaming babies both ways, flight was fine. By the way, what is the SOP if pax can't hear the safety briefing due to screaming babies nearby ? I know the aircraft PA is a MEL item because of the need to hear this same briefing.