that's the thing with cooking, as i'm 100% sure Ivan already knows, when you fix one thing... it tends to break another. The trick is finding the compromise that produces a fully functional ROM (or at least what appears to be one) - This unfortunately is where mixing and matching OEMs generally comes into play... and this can take hours upon hours (if not days) of cooking and testing to ensure functionality.
So I completely understand where you are hitting your head against a brick wall