Hi Directive/2004/38/EC, you are absolutely right, i just double checked and reckon that i did fill the form VAF5 online before travelling in order to get an appointment for the visa and then filled EEA2 form. VAF5 is probably the family permit application form you were talking about.
The UKBA officer must have therefore consider the VAF5 instead of the EEA 2.