It just seems like if the glass would drop another 1/2" the display would be centered, the upper lock would engage properly, and it would be easier to remove the glass - right now I have to play around with it to get the bottom out, there is like no clearance to get it out. When this first happened, the clasp on the lock was hitting the glass, that's why I reversed it, so it would clear the top.
Remove and replace the speaker panel. Once installed it should drop down a little, enough to make everything fit. Even when it all fits together the display does not line up exactly right behind the backglass. You should not have had to mess with the latch though.