Do you always ride alone?I've found its been easier for my to face my fear when I ride with others. I do a group ride once a week with a bunch of awesome women. Feeling so comfortable has helped me get over been afraid of riding clipless and riding on roads with no bike lanes. My pedals are still SPD/platform in case I'm in a situation where I feel claustriphobic I can flip them. Clipless has helped me improve my speed and stroke but its not essential. Riding should be fun and for me is therapy as much as exercise,so do what feels good