Sorry for not commenting but I had my first free weekend in a long time and forced myself to not use the computer at all.
Today I'm back in the trenches with Apple (they don't respond over weekends) and I hope later today I get in contact with them to resolve the problem.