Might be too complicated but select focal point as part of the upload procedure?
It still kinda ruins the compositions though.
A small thing you could do would be to make the credit:... skier:... underline when you hover over it, making it clearer that clicking there will lead you to the photo page. I know clicking it already takes you to the photo page, but it's not obvious.
England is shit.