I entered quite a few times under visa so far and my experience has been more than fine (in fact, it's even been pleasant). Hopefully, it'll never get to what you've had.

It happened a couple of times that the officer wasn't sure if I was doing what I said I was, for whatever reason, and they generally just asked a follow up question like "do you have an access card for this company and can I see it?" which resolved the matter every time. Didn't realize it was so close to "wait in the horror room for hours".