If anyone's curious, my lawyer said that Yahoo's terms of use leave it open to interpretation. He said, there isn't really a fine line between commercial and non-commercial, it's not a black and white issue. Overall he thinks what I've been doing is ok.