(This is in reply to the long discusion of why your boat is slower with just a mainsail)
One problem is your main is not cut to be sailed as a uni. From what you wrote, I would say your main is too flat for the weight and sail area. It could be just perfect as a sloop but too flat as a uni.
I tend to agree that for a non-overlapping jib, a optimzed sloop with more sail area will be a little faster than a uni. In theory, simulation, a wind tunnel or flat water and absolutly steady wind. I think a uni would have an edge. In reality, mostly because of it's greater flexability I think the sloop would have a edge. This based on experimenting with a Wave and a N6.0.