I like the line up they use better. Not sure why they drop Happ against a right handed pitcher. The way you are suggesting leaves Suzuki, PCA and Happ in some order 4th thru 6th. I think Happ is better against right handed pitching that Nico. So why not have him earlier.
I would like to see Busch, Bregman, Happ, Suzuki, PCA, Nico, Mo, Swanson then catcher. That would be my line up against a right handed pitcher.