In the new example, it's perfect for horizontal picture: they are all perfectly aligned. It's just vertical pictures: really too big. Your first idea is may be the best way if we can only choose one value and not both.
Not necessary centered in a white box, just centered and not to the left, especially with vertical pictures. Like here:
http://www.juzaforum.com/forum-en/viewforum.php?f=4