It seems to me that the N20 rudders are smaller than the 5.8 rudders. Very different shape, though. I'd be more inclined to give the N20 rudders a try than the 5.0 rudders.

I'll have to start playing with the daggerboard settings. I would guess leaving them down will produce more lee helm, but help get the windward hull out of the water.