have you tried co-sleeping at all?
her waking sounds completely normal to me and i don't think you have any problem with your milk supply.