Troubadour, your view is not supported by PHE.
They are clear that infection is falling in all groups except MSM, and that there is a real rise in MSM infection that can not be explained by more testing.

"The rise in diagnoses among MSM may be explained by both an increase in HIV testing and on-going high rates of transmission. The number of MSM that had an HIV test in sexual health services in England increased by 13% from 64,270 in 2011 to 72,710 in 2012, while in London the increase was 19% (from 28,640 in 2011 to 33,980, in 2012). However, estimations of HIV incidence using a back-calculation analysis [3] indicate that HIV transmission among MSM remained high with 2,300-2,500 new infections annually and 7,200 MSM undiagnosed in 2012, with little change over the last decade (Figure 3)."

"Over the last decade, the number of new diagnoses among heterosexuals declined in England, especially in London."

http://www.hpa.org.uk/webc/HPAwebFile/HPAweb_C/1317140300680