No, the AUMF does not override the FISA, because even the AUMF does not authorize a police state. It is a police state to allow the government to look through records of its citizens without a good reason and a warrant. The AUMF does not go that far, and the government is going too far when it reads our emails and listens to our phone calls.
No, authorization for use of military force does not override FISA, because the current amount of warrant wiretapping and information harvesting goes well beyond identified threats to the state. Since September 11, 2001, these wiretaps have continued, and have increased, not decreased. It is disingenuous to say that these wiretaps are only for limited political scope. Rather, these wiretaps are utilized, without warrants, whenever the government sees fit. This is not a legitimate use of military force.