Lotions/bath wash/shampoos

I am prepping for baby and trying to buy products that will work well for eczema (I had it when I was young and still suffer from dry skin). I also want safe products, but all of the safest brands seem to have poor ratings for eczema. I bought the Shea Moisture unscented wash, Mustela foam shampoo (for cradle cap), and Aveeno baby eczema cream. I know Aveeno is made by Johnson & Johnson, but they have a safe rating according to my EWG app. I use Aveeno on my skin and the colloidal oatmeal really seems to help. Are there other products that I should look at? I've been using Earth Mama Angel Baby stretch lotion on myself and I do like it, but it doesn't seem to hold the moisture as well as my Aveeno lotion. Does anyone have any other suggestions, or should I keep the products I already have?