I just came across this thread. Sounds like things are on the up - you're doing a fantastic job! The early days of breastfeeding can be full of ups and downs, but many mum's find things begin to really click by 6 weeks. Don't hesitate to call ABA's 1800 MUM 2 MUM any time (24 hrs) - totally free service for all Mum's! Your local group will also be a fantastic support along your journey.
All the best