Actually in scenario B, if he singles, he'd be followed by our 4, 5, 6, and 7 guys. I'd hope these guys aren't weak singles hitters. I think we need to bat Madrigal either 1st or 9th, preferably first. Batting him 9th sounds bad, but having a great hitter with no power at 9th gives you a legit chance to score in any inning.
If our 7th and 8th guys get on, we wouldn't have to worry about the back breaking DP in front of our lead off hitter. We will be strong 2-6 so no room for him there if he's not leading off.