I'm not entirely sure what you mean by outputting the data by context. I thought part of the reason we did it this way was to not have to jump back and forth and grab context refs but maybe I'm misunderstanding what you mean. Also I don't know if I want to make large changes to the xml structure this late because then we also have to make changes to the javascript to load it. Maybe if you could write some xml in the format you want and I could understand it better and see what you mean.
We've also had the ability to rename tags since iteration 2, and if we rename 2 tags the same name they will appear as one field in the output if that helps with your second problem it is very easy to implement.