While your individual numbers are off, the overall total is right around $91 Mil, so from that area, you are pretty close on.
I think that is right where Drayton would want it, giving room to expand it a the trade deadline or Clemens addition.
ETA: BTW, There is about $15 Mil comming off the books after 07 as well, with Biggio, Ausmus and Bagwell's buy out. So there is future flexibility to expand, Jenning extension or FA/trade add.