I just got my Unmarried Partner visa. After MUCH confusion and after email everyone I could, we determined that I should fill out the VAF-2. However, what you should do is use the e-fasttrack online application. It determines which application is appropriate based on how you answer the questions. Easy!