I'm in a very similar situation. I've been a EVO 4G owner, and had always assumed I'd buy the "EVO II". But I've been uneasy about that ever since learning that it would be 3D, since I can't see in 3D. I realize I can turn off the 3D, but I've always been concerned that more developer effort and features for the phone might be sacrificed to favor the 3D. One thing I liked about the 3D was that I felt HTC would be sure to get a killer camera in the phone since 3D photographing and video would be an important part of the product. I use the still camera on my phone a lot. So I did a preorder at Best Buy the first day they were available.
But the concerns raised in the initial reviews, especially the lens cover--Seems like a bad design to me, especially following on the concerns this raised in the OG EVO. I gather that HTC maintains that it is difficult or impossible to scratch the material of the lens cover in ordinary use, but I still am concerned that fingerprints or other foreign junk will get on the lens cover (one of my bad habits is web browsing on my EVO during lunch, and I have gotten spilled soda and other foodstuffs on the back of my phone!). At least one review suggested that glare caused by the lens cover was lowering still picture quality. And it doesn't appear that the camera is awesome--One thing I do envy the iOS users is that the iPhone 4 camera is quite good, I wish we could get similar in an Android phone!
This, plus the announcement that there may be two comparable phones coming to Sprint in the near future made me broaden my horizons, I had literally done no research into alternatives till the first hands-on reviews were published. I initially was interested in the Photon, but I believe the S II looks better, even though I may miss the dedicated camera button. I'm _NOT_ going to get the EVO 3D asap, as I had intended, but am going to wait. It's still conceivable that reports from actual users (and perhaps hands-on experience at the Sprint store) will lead me to get it, but I'm going to wait and see if the predictions of a late July launch for the S II come to pass. If there's not an S II date officially announced by the end of July, impatience may get the best of me and I may still get the EVO 3D. I do like Sense, and some of the changes in Sense 3.0 look attractive (though I suspect the resource demands it makes may slow down the 3D, user experiences here will have to confirm or deny that hunch).
To summarize, I am leaning towards the S II now, but it's still conceivable that I'll go for the 3D if my concerns end up not to be an issue.