Sounds very frustrating indeed!
The first thing that pops into mind is, sounds obvious but you haven't mentioned it, have you been to (if located near one) an Apple store? They are generally very accommodating.
If not an option, chatting to Apple Support?
Ah good thinking, let's hope it stays that way 🙂