Yeah, it's really up to you. If you believe you are comfortable enough on your bike to go to clipless, then do it. I seem to go back and forth with them on my mtn bike but I enjoy platforms on it more(for the type of riding I do on it). I love clipless though, and use them on my other bikes.
I'd say to go with the eggbeaters, I had some of the 520's and riding cross/mountain biking with them was a huge pain in the butt. I'd always get mud and stuff in the pedals and would have to stop and clean them out. The eggbeaters seem to always be pretty clear of debris, at least for me. good luck!