What Gen III Hemi dipstick tube are you running with a swap pan and headers??

It might be worth a shot to try the truck dipstick and tube, #53021322AF . Not sure if it will hit somewhere but the bend and mounting points are different than what's pictured in OP.