I agree, there should have been more. I'm also curious about what the OP's last encounter with CBP was like immediately prior to being met at the gate and having his devices taken. Because it seems they have recently escalated the intensity of their scrutiny of him, and I'm curious why.

I hope he'll report back about whether he gets his devices back, it shouldn't take all that long if the devices are clean.