I got lucky. Athearn had only three roof sections to the F59PHI in stock. Bought them all. That is half the battle.
Now if I can make this Hydrospan 400 work properly, I can shrink the Q-exhaust hatch section from an HO DB hatch and I will have all I need to build a Q-equipped SD40-2 snoot.