So what exactly should I have in my hospital bag again? and is it ok if I put my stuff in the diaper bag as well instead of having 2 bags
What I've done, is looked up recommended lists, and then taken what I think I'll actually use and packed those items. Ask family/friends who have given birth previously, they're a big help too.
I packed an outfit for me to wear home and a few outfits for my son. My hospital provided everything else even undies (they were so comfy)