Been a while since I changed one, but I think there is also a small phillips screw for lateral alignment you have to remove to swap the headlight unit after removing it from the shell. You only have to pull the two side screws to get it free to pop out of the shell. On mine, remove the two screws and swing it out at the bottom (there is a lip hooked at the top).
