Thanks Gbar, I think you got me on the hip size. I don't recall noticing the 2x6 jacks sticking down below the hip so I'm betting that I didn't pay enough attention to realize that the hip was a 2x8. I'll have to take a look again.
The rafters are all 16" oc so I just pulled up Table R802.5.1 (3) which should be correct for my situation (30 psf snow, 10 psf dead). Looks like the 2x6s aren't enough unless they happen to be select which I doubt (but will certainly check for). The overframe itself shouldn't put the roof above the 10 psf dead load because I'm planning on removing the old shingles before overframing.