This sounds awful, but sadly it's in keeping with what BA are going for nowadays.
I'm confused why you deliberately booked the LHR/LGW connection but then asked BA at LHR to change it. Given the laptop rules I'd be surprised if CAI staff refused a shortcheck of a bag for 'laptop return' reasons