Brian, A couple of comments:
I wouldn't charge the way you do, because it looks complicated and the clients don't know how much they are going to be billed in the end. State what they are going to get and how much it will cost. For instance: Engagment Session - 2 hrs + x# y sized prints for $ZZZ. Weddings would be, say, 4 or 8 hrs of coverage, with minimum # proofs (for each) + CD and a price for each. Then give a price for overtime. When you are putting up pictures for marketing, as opposed to on-line proofing, I would suggest tighter editing. Do not put up multiple, similar shots or weak shots. BR

