@c88c91 Try backing down the soap. Seems counterintuitive, but stay with me here.
Cut out soap from pre-wash, lower amount of soap in main wash. If you are doing a regular load of diapers ( drum is half to 3/4 full) then line 1 in detergent should be enough, especially if you are using...