my pediatrician gave me a formula once to calculate if baby is drinking enough milk. this formula is only applicable when baby is on all milk diet.
take his weight multiply by 150ml divided by number of feeds a day for the lower limit
take his weight multiply by 200ml divided by number of feeds a day for the upper limit
so as long as your baby is drinking at that range, it is enough.
as for switching sleeping time around, i think there's a thread somewhere in this forum that talks about this... maybe you can check it out.
it's here How to correct newborn sleeping time?