I'm sure you've already taken care of this, but when my Mac gear needed servicing I just sent it back to Mac. You would be stunned at how reasonable their repair costs are, and when you get it back it will meet or exceed original factory specs. They can also update the speaker connectors, etc..
Norman
Norman