I take it OPF is the newest version, WTLP, mine is a 2018 Face Lift but pre OPF, I assume.
I was thinking of going down the APR route and getting the APR DSG map and a second map for 98 RON (we only get 95 here in the Republic of Ireland). But I am not too fussed, like yourself, about switching...