VR camera leaving character collider in roomscale.

Hey guys.

I've been working on a first person shooter for oculus go for a while. I am not using the OVR camera rig or the character controller prefab, as I like to have more control over the way it moves and the way the gun rotates. The camera is a child of a capsule collider with a rigid body.

I got myself a quest, and wow it is fun! My only problem is now that I can walk around in my environment, my original controls still work great, however if I leave my original position in roomscale, I can now walk through walls, and worse still if I turn around I can actually shoot my character collider and take damage!

Is there anyway I can have the camera limited to a certain range of motion within my rigid body capsule?