Yes and I appreciate your suggestions I didn't mean to imply otherwise.I'm just trying to think of ways which might mitigate the issues you are now having.
You're probably going to have to wait for the 5.4.5 firmware update for grey imports that someone is working on.
Who is working on the 5.4.5 firmware? I'd like to try and follow him/her or the thread.