If clipping/unclipping has become an issue, as it did for me, I suggest you consider pinned BMX pedals and something like Five Ten shoes.

Clips made me about 10% faster than quills/toeclips. The BMX pedals make me about 8% faster than quills/toeclips. I find starting and especially stopping are much easier than with either quills or clips, and I can place my feet on the pedals to adjust for terrain and knee pain.