Sawyer squeeze x2, though get a bunch of their bags or like the big msr dromidery bag so you don't have to be messing with getting water alot. I would only get a pump type over the squeeze if I had to be doing a shit ton of water filtering.
Beavers I heard are the worst for giardia and the like, i know one person who got giardia and that shit wrecked him for like a week until he got the antibiotic. I'll drink water untreated from springs i know are good but anything else treat your water or you'll get some real nasty stuff.
I saw deaths are at their all time lowest i believe, combined with high positives and lots of testing thats a really good thing. The idea that this country was going to do it NZ style i think is just laughable.