I'm on the same trip with Brooks and you described exactly what I've packed. I'm taking a Stohlquist shorty with the non-latex gaskets and longsleve hydrosilk shirts for SPF.
Now I've just got to work on my ' Will roll for beer ' sign to tape to my helmet!