Another vote for a Willie 16x54.
I'm in the same predicament as you atm. I'm in the marker for a drift boat and am interested in a Thor, Hyde and Willie. Already have plenty of oar time in the Willie and the Hyde, just haven't touched the Thor yet...I'm a frequent visitor to Idaho and fish the Salmon and Clearwater religiously. The 2 boats we use over there for the Salmon is a 16x54 Willie and a 16x54 older Hyde. The Salmon is a very technical river with plenty of class 3 and 4 rapids, and i wouldn't want anything bigger than a 17 foot boat in those rivers. Any bigger and tracking/maneuverability suffer severely. The Willie tracks nice and responds crisply on each oar stroke/pretty decent maneuverability. The high sides make it nice for big rollers and the boat is plenty roomy. I would stay with a 16x54 for fishing on the Peninsula/rivers around here. And if you ever feel the need to go have 10-20 fish days in Idaho, you will have a good boat for over there...I haven't rowed the Rivtec yet but would like to give that a test. It looks like a very well made boat, and i have heard nothing but good things about them. Wouldn't be a bad idea giving them a looksy... Would also like to find someone with a Clackacraft who wouldn't mind me rowing them down the sky for a day...
Good luck finding a boat!