Yes, Thomas Bertilsson, your choice of moving closer and using short lenses is YOUR decision, having to do with YOUR sense of the aesthetic, in the immediate situation. This is refreshing to hear and attenuates the definitiveness of the 'standard' rule regarding proper focal length.
I want to say that I never could understand that the 'normal' focal length, however, should be the diagonal of the full 35mm frame: i.e., 43mm. I have found the Helios 2/58 to match more exactly what the eye really sees. (Using that lens for portraiture is, however, a matter not related to that assessment of 'normal'). - David Lyga