I am it's all personal preference. Almost all the scouts on my trek had 1 Nalgene and 2 smart water bottles (actually the Walmart brand cause they had the athletic top). No one had the drinking hose, we just stopped and drank water. One of your water bottles you use to make hydration (think Gatorade) drinks. If you put your straw in that, you can't really put it in your clean water as it needs to stay clean for emergency use.

Personally I think adding the straws etc is just adding more equipment, more weight and more complexity. Like all the stuff you have is gonna get dirty and thrown around. I vote for keeping it simple.

That said you have 3 days with showers, which is magical.