Janne,
You have the right idea!! In your second picture, the shoulder line is much better but still needs to come more parallel to the arrow.
You are correct that what you are doing now WILL hurt your shoulder.
Start your draw with that bow shoulder low and relaxed, bow arm pointed down at about a 45 degree angle, then lift the bow arm up toward the target but keeping you bow shoulder low.