The setup now looks reasonable but this is the Internet not the LBS therefore **********?
Note that moving the saddle forward will bring you closer to the bars but also move you to a different position above the bottom bracket.
...yeah you can raise the stem.
...get a shorter one if that helps.