If you're still checking out your options, maybe consider Montrail. I love my inov-8s for dayhikes and short weekend trips, but for more substantial trips I use montrails. My girlfriend and I both used Montrail Mountain Masochists when we did the JMT last year. She has a wide forefoot, and I have a regular/medium forefoot. My max pack weight out of MTR was 30lbs.
I appreciated the extra beefiness of the montrails, though they were still very lightweight in my book. It was the underfoot rockplate that I truly appreciated, which I felt was more rigid than my inov8s. I had no failures on the trip and continue to use the same pair today. I threw them in the washing machine when I got off the JMT and they came out looking almost new. You may want to consider replacing the stock insole...mine was pretty pancaked after 180 miles or so, but overall shoe was still very comfortable.
Like others, I didn't bring water shoes, choosing instead to just wade through with the same pair of shoes. They usually dried within a couple hours, although they were comfortable after 20 mins or so. If you're really worried, just remove your socks and insole before the water crossing, which should cut down on the amount of time it takes before your wet shoe becomes comfortable again.
Also, you might like the montrai sabino trails which offer an even wider forefoot.