Please perform this test, as outlined by @paulmatthijsse, above:
Put your camera on a tripod or table, choose a static scene (so without leaves moving in the wind), use the 17mm position, set self timer to 5 or 10 seconds, use the A position (Aperture priority), set aperture to 8 and take the photo. Any better or you’re still dissatisfied?
Have fun!
Claes in Lund, Sweden