Yes, Betterfox all the way in + few custom settings.

I am still in position where I need to put some small pipeline to automatically download latest + merge my stuff and deploy, but even if it's manual every month or two it's not too bad.