HTC One or Galaxy S4 (or wait till WWDC)

I'm an iPhone 5 user (my third iPhone) but the new HTC One and Galaxy S4 have peaked my interest to Android for the first time. Coming from iPhone, which is the better option overall?

I am also considering however, waiting til WWDC to see if Apple can revamp the UX because my gripes with the iPhone are only that I feel their software is lacking. Frankly, I still think the iPhone 5 is a superior piece of hardware