Hi Pan, Nice to see you!
I must quibble with your use of the word “treyf” re: challah made with butter. The term “treyf” is used for foods that are not kosher, such as pork, seafood, etc. Ergo, challah made with butter is not “treyf.” It’s just that it can only be used with dairy meals.
