WW/Storm losses imo. Cap/Supes + sheild. The fighting ability and tactical mind captain in a frame of superman would be a nightmare for WW even if she gets added weather powers.
I think that cap/supes can resist or block any weather effects made by storm. And with cap's skills and superman level stats he would made very very short work of WW/Storm in cqc.