Multiple Untagged /24s within one VXLAN VNI?

I have an interesting situation I've never seen before-

Client has two sets of four EX2200s daisy chained, all ports are untagged. However they have three /24s in use on the hosts connected to these switches, and to make things interesting they are not contiguous.

There are devices in 192.168.1.x, 192.168.3.x, and 192.168.4.x subnets with KVM virtual machines that have untagged sub interfaces across all three of those subnets.

They did it a second time but with 10.1.1.x, 10.1.3.x, and 10.1.4.x networks, pretty much the exact same setup.

Before I got involved, they were looking to buy some EX4300s and just swap the 2200s one-for-one.

So obvious VLAN tagging nightmare aside, is my thinking correct that I could employ EVPN VXLAN to virtualize those untagged VLANs into VNIs and emulate their current physical infrastructure? essentially something like VNI 1000 will be an L2 domain including 192.168.1, .3, .4 and VNI 2000 will be a separate L2 domain including 10.1.1, 10.1.3, and 10.1.4

Obviously I would like to move them away from daisy chained switches and nearly pegged out inter-switch 1G links. So my thinking is EX4300-MP top-of-rack switches and two EX4600s to act as spines. I know the QFX line is better suited for EVPN VXLAN but I doubt they'll be using the more elegant features.