Most of AW's cells have buttons. Not sure if his 18650s do, but you might want to look at his cells. Great cells, just cost a bit more than others, but very good cells.
I just received my 18650s with built in protection from batteryjunction.com
I think they were the same price as unprotected 2400mah sold elsewhere. But I don't know if the PCB is loaded on the V+ or V- end. I am not an expert, but since the vent is on the V+ maybe the PCB is on the V- end? But if you email MattK of batteryjunction he is super helpful and responsive.
Also they are the same dimensions as 18650s which is weird cause they have to accomdate the PCB yet they don't lose capacity.