It is pointless to hire independent OGs. This always includes the EG, especially with stair changes. The stairs look somewhat narrow, and the staircase coming from the left side of the plan also looks somewhat short, or the overlap with the bathroom is too large.
And it is also pointless to produce different plans continuously without providing reasons, explanations, etc. You have to do this; the better you can justify a plan, the more comfortable you will feel with it. Otherwise, we cannot understand your thoughts.
Are all these KG pipe positions connected to the water drainage from the property?
And have you ever inquired with the building authority about the original plan?