I think you basket sounds great - all the sample things will go well for a diaper bag. I would not get a baby bath. I have seen so many at garage sales. Most babies grow out of it quickly and it is so easy to just clean your kitchen sink well and use it for a baby-bath-tub.
You could get a basket with a baby-theme cloth insert that mom could use to hold stuff for the changing table, or use a baby blanket as deerekid suggested.