I know you had a rough start, but it sounds to me like you got it all perfect in the end

Do you have an LC to talk to? She may be able to reassure you about many of these things and confirm your plans.
Your inverted nipples may no longer be a problem (?) after breastfeeding.
Also, is there any particular reason you're so anxious that your milk comes in quickly? Because of the top-ups last time? Your milk probably will come in faster in any case and *most* of the time colostrum is all your baby will need in the mean time. Expressing before hand is not always recommended - there probably isn't the risk of premature birth here, but you may find it extremely time consuming. Maybe talk to your LC.

It's great to think ahead like this and make yourself a breastfeeding plan. Remember that all births, babies and breastfeeding experiences are different, though. I'd recommend giving your baby a few days before embarking on expressing and such like right off - it's extra work that might not be needed anyway.

All the best!