i think what you have is ok. Id actually add some socks to both labour bag and hospital bag for yourself.

my first i only had to bring stuff for me and going home outfit for baby. (rest hospital supplied)

my second (different hospital) i had to supply everything for baby.