If this were my truck, I would move the front spring hanger forward about 2". This would solve the shackle angle problem, create more clearance between the fender edge/tire, and lengthen the front driveline. Bumpstops and limiting straps will keep the shocks and springs from overtraveling.
X2 I usally like to keep the shackle (at rest) about where you have it in the second pic on page 2