SAM2: You are correct that Davar B’Tzina is Noheig on Friday night unless it is Leil Tevilla.
Another slight error is that he states “ideally one should not eat meat until Monday daytime”. Rabbi Shimon Eider TZATZAL states in his booklet that one is not allowed to eat meat or drink wine on Sunday night (except if you are making havdalla on wine).