What Apple could do to is to move the bar from "rubber hose decryption" to "rubber hose account access" by offering a dead simple cloud recovery. Imagine a "Flight mode" where everything on your phone is backed up to apple and your phone is presented with an "enter backup id and password" dialog which allows you to load anyone's cloud backup and is essential a factory reset. Border control might still force you to enter a backup id and password under the assumption that you surely have one, but (to my limited knowledge of the US legal framework) it would not be a felony to load a "duress" backup id (because there is no such thing as a duress backup id, just different data sets).