Believe it or not, it is possible to operate independently of your knowledge of MBTI. I used to pigeonhole people as well, and occasionally I would think "Well, he's an ESTP, so I should do this and this." No, don't do that. Just go with the flow. Every person should be handled individually, regardless of their type or your perceptions of their type. Just stop caring about it so much.
MBTI is just a convenient system we have to explain some trends in behavior. It doesn't define the individual, and I doubt it was ever intended to be comprehensive. In other words, there is a lot of overlap between the sixteen boxes. I have some characteristics of both ISTP and INTP. From each type description, there are things that fit, and there are things that don't fit. The same is true for everyone on the planet. As a result, everyone needs to be handled individually, or you risk making invalid assumptions about their preferences.