Xen vs KVM: Which will have likely better support (read:bugfixes) in the future?

I don't care about GUI or tools, but I do care about stability and performance. If I'm running a FreeBSD firewall and a Opensolaris file server as guests, will I get better stability or performance (network and disk i/o) if I switch to KVM? Follow-up question: which is most likely to be rock-stable and near-native i/o speeds in the future?

More details:

Currently I have a xen server with an OpenSuse dom0 and several domUs including *NIX and *BSD.

Problems I currently have with the latest xen as of ~August:

• Networking in PV kernels buggy: can't change MAC of vif in dom0, packets get lost if using a domU as a firewall
• FreeBSD 8.1 not stable as a PV domU
• HVM domUs not stable under heavy I/O load

Supposedly the networking bug in the PV kernels is fixed, so I'm looking to switch distros to one that uses pv kernels. I figured that if I'm going to redo Xen from scratch, might as well look at the competition and KVM seems somewhat promising.

EDIT: I don't care about GUI/management tools as I only use command-line options.

KVM is now in the Linux kernel, and as of late seems to have more momentum -- e.g, Red Hat has switched to supporting it over Xen. That said, I don't see Xen going away anytime soon, and if you feel more comfortable with Xen you're probably fine with it, especially since they share many of the same managment tools through libvirt. Both will also get pretty good performance through virtio, and though my experience is with KVM, I'd consider them both "rock solid" for a wide variety of guests/domUs.

Edit: I should add that we've run a huge variety of guests under KVM, including FreeBSD firewalls, with none of the issues you've mentioned -- it has just worked.