Fight - WW
Story - WW (Storm's story started out good but lost her way when she went punk...Damn Claramont)
Intelligence - Storm has a college degree in meteorlogy and is quite well-versed in a number of fields. Diana on the other hand can speak more than a dozen languages (not counting animal languages), has almost a dozen Themyscirian Ph.D equivalents in science, politics, etc. Her Wisdom of Athena also enables to absorb knowledge at an exponential rate similar to that of Superman or Kid Flash.
Looks - Depends on preferance and artist. They can both be hot.