What beautiful water! You are right about those undercurrents, never get in the water where a river is dumping in water! It sounds like you had a nice "low effort" hike, sometimes those are the best kind! You even came across a deer without spooking it off!
Has the weather started to cool down at all yet?