Yup, bring that stem up, and from looking, I think you can move your saddle very slightly forward. If I dropped a plumb line, I think that your knee is a little behind the axle on the pedal. (Anybody feel free to correct me here). I would try that for starters, then lower the seat slightly, then consider the stem changes, starting with an 80mm.

Keep in mind that any change feels better... for a while. This will take some fiddling to get right.

It's easier to make a small bike bigger, than a big bike smaller. You'll get this.