I bought a 2019 DS3 about a year ago. I was pretty much in the same circumstances as you... get the seat the right height but then leaning more downward than I wanted and a bit more stretched out than I wanted. Thing was I didn't know just exactly what stem I wanted (angle and length) to replace it with. OTH, I didn't want an adjustable stem because in the past (long past!) those adjustable stems weren't solid feeling and they tended to have an annoying creaky sound when riding. Long story short, I ended up buying one of these in 90 mm length https://www.amazon.com/Ritchey-16053...s%2C166&sr=8-1

At the time my thoughts were I could adjust this stem and figure out what I wanted and then get a solid one piece stem to match that. Well, here it is about a year later and I've still got the adjustable on the bike. This particular model is difficult to adjust the angle compared to a one screw type but the reward is ending up with a stem that is very close to being like a one piece in terms of being rigid. All 4 of those screws, on the Ritchey, secure the stem on the bike but the thing is in order to change the angle you have to loosen them so much that you end up, often as not, needing to realign the handlebars. It's like a 5 minute job as compared to a one screw adjustable stem that takes about 30 seconds. IMO, the reward is worth the effort.