To get more upright, start at your spine angle. Stand a littel more upright. This forces your arms to have to lift up rather then around.

Then let the arms stay more in front of the chest through the whole swing. Don't feel as though you are pulling them into the chest at all. Create an imaginary boundry at your shoulders...never crossing that line with the hands.