You sound like you're going great. Expressing is really hard work so if they say that you can cut down on doing it night then give yourself a break.
The best way to encourage your milk is to put your baby to the breast whenever she wants it.
By te sounds of it you'll be exclusively breastfeeding in no time.