Yea that's why if there's a new DF I wanna use, I'm just switching characters. Not giving it to Leo. That's what I did with Roshi and the Goro.
Leo has always been Mera, and now added Phoenix. The reason why I didn't give Leo the Goro with the Mera, even though I would've loved that, is because I didn't know how to justify him surviving eating 2 fruits. We don't know Blackbeard's method yet.
Phoenix seemed fine, because I could say upon consuming it, the Mera's flames started to burn Leo to ashes, but then he rose from those ashes as a Phoenix. Fits completely.