I'd definately take off the shifter if it's remotely related to the drivetrain. They will do anything to avoid paying up on warranties. Swapping shifters isn't very hard so I'd definately do that if I was you.