It is correct that the primitive unit cell only contains one lattice point. Your counting also suggests that something goes wrong because every unit cell must contain an integer number of lattice points.
Try applying what I wrote over here to find the basis using the primitive unit cell.·