If anyone still has any issues with the Mac installation and R3 / R7 update I can probably help.
I know this is going to be a different issue, but something to be aware of: I have found sometimes if you move or delete the uploaded binary file, next time you start the upload tool it doesn't run at all. So it can be a bit buggy. If that happens, just try to put a binary file in the same location with the same file name as before, and then suddenly the upload tool magically works again!