I think I've got it...

I just tried on the improved bodice petticoat and it seems taking apart the straps at the front seam and joining them with ribbon to the corselet front did the trick. I'll have to try it on over a longer period of time on Wednesday, and check whether the wedding dress still fits over that, but no immediate shoulder pain was felt. Yay !