Java formatting: Indentation of conditions inside if (...)

I have code like this:

        if (a = b && c == d
                && (e == f
                        || g == h)
                || i == j) {
            k = l;
        }

        while (a = b && c == d
                && (e == f 
                        || g == h) 
                || i == j) {
            k = l;
        }

I haven't been able to find settings that make the code formatting indent the code as above.

If I enabled Wrapping & Braces -> Binary Expressions -> Align Parenthesized when multiline, the result is

        if (a = b && c == d
                && (e == f
                            || g == h)
                || i == j) {
            k = l;
        }

        while (a = b && c == d
                && (e == f
                            || g == h)
                || i == j) {
            k = l;
        }

This is close but the line with g == h gets indented 12 spaces instead of 8. Somehow seems that IDEA combines indentations settings a bit too much here.

If I enabled Wrapping & Braces -> Binary Expressions -> Align when multiline, the result is

        if (a = b && c == d
                && (e == f
                    || g == h)
                || i == j) {
            k = l;
        }

        while (a = b && c == d
                   && (e == f
                       || g == h)
                   || i == j) {
            k = l;
        }