How should I approach/charge for this particular freelance job?

In the past, I worked with a friend (really more of just a good acquaintance) writing the copy for his website. Not only did I write the copy, but I helped him conceptualize everything, as I feel good writers ought to be able to do.

This was VERY time consuming, as we are both perfectionists.

He paid me well, but NOT well considering the hours and re-writes I put into it.

So now he needs another job done. Another website, and perhaps even a brochure. We are going to be meeting within the next few days to discuss things, and I want to come prepared with either a rate, etc.

Last time, he paid me half up front, and half later. I worked so hard that I asked him for more money, which he obliged.

I know I am a bit all over the place, but any type of guidance would help me out a lot…..Perhaps charge per job? I would like to say, what I write is what i charge you for, and any re-write is more….but that isn’t cool in my book….