#2 does it for me. Everything as near to spot on as you can get.
Number 2 for me however there is something about that first one that i like but cant explain why lol
With only 800px to present your image I personaly believe it's better to use those pixels on the image instead of black and white borders.