Got a call from Apple this morning...they offered Holly yet another MacBook Pro. This time, we turned them down. We said it was time to go desktop. They told us of the pros and cons of the iMac versus the Mac Pro. We went with the iMac...top end.
Got it set up with Leopard and everything. Seems to be running fine now.