I am very glad you got things working -- even partially.
As you are now running -current, you may want to share your experience, and discuss your partially working environment on the misc@ mailing list. The lead Xenocara developer (matthieu@) is active on that list, and he or his team may be able to work up patches for you to test. If you do receive any patches, you will find FAQ 5 very helpful in applying them to your system.
Before posting to misc@ for the first time, please read FAQ 2.2,
http://www.openbsd.org/report.html, and
http://www.openbsd.org/mail.html for guidance.