To avoid conflict, I think Astoria or Tracy will be the option. Though i can feel that Fleur will become his partner for the Ball. And it will be like Adding a fuel to a fire.
I certainly thought that Luna was going to be our MC ball date, so he could dodge the shenanigans of picking a girl.
Now Fleur could be a possible medium to start a fire in the girls.