Chris:
The two problems are separate. Your idle speed is too low, the
injection timing is late, or the pump is worn. I would up the idle
speed a bit (this isn't just turning a screw, alas), and would check
the timing chain for "stretch" -- likely you have 6-8 degrees of
"stretch" and the IP is late, making things worse.
The rough idle hot is partially cured by an adjustment of the rack
positioner stop bolt. If you don't have the new one, replace it (I've
not done this, not having a 617 turbo). The idle will smooth out as
soon as you lift off the idle stop, and the problem is worse hot than
cold. ]
The issue is actually a weak spring for the fuel control rack, but you
have to completely disassemble the IP to fix it -- it will get worse
with time, and evetually may force you to get the pump worked on.
Peter
