Could you try to merge your changes with HEAD and then use svn diff to create a "real" patch? That would make it a lot easier to work with your changes.
I give all sources cause Rick prefer. But I'll try to create a patch, but I'm not sure to succeed ... -- </arnaud>