You sound very much set up and ready now!
I Like you, am eagerly awaiting the arrival so i can start using my fluff!
you have done pretty much the same as me in regards to types/variety of nappies and wipes, which i think is best as i know some ladies were put off by badly fitting cloth and turns out its just the fit of a particular brand on their baby!
to the arrivals! (when they get here - i'm due in 4 weeks today