I didn't respond on the original question, because I've only been there once, but your plan sounds doable. Just stay as flexible as you can on destinations.
For the rig, that I know. For the drift trip on the Madison, you'll want a 6wt or 7wt. You'll be catching 16" to 20" fish, and throwing a good bit of weight in moderately heavy currents.
For smaller streams in the park, take a 4wt or maybe a 5wt. I used the same length of leaders and tippets as I would use around here. I think 5x was the smallest I put on. The fish are well educated, but not supper spooky.
If you're going to try to fish Henry's Fork in Idaho, that's another story. Long leaders, fine tippet and delicate presentations... I got skunked on Henry's Fork. Fish were rising everywhere, and I couldn't connect. o-o