This is an annoying issue that I too have spent a lot of time on. Looking around at the Internet it seems like many others have the same issue and it is one that will only get bigger since even the official Raspbian image is Stretch.