Yes, claim for everything you can think of, including the TPs and also perhaps put in £100 for loss of amenity thanks to an unwanted evening in Switzerland. Heck, that's a knock down price! You won't get everything, your claim will be potentially reined in, but as I say, two can play hardball. And CEDR can't give you more than you request.

Note that this may take a few months. You also need BA to issue a final rejection, or wait 8 weeks (more details in the EC261 thread), and you better get a specific claim for EC261 into BA straightaway.