In the South

[SP1]

Should I replace the inner curved wall of the building with a straight wall?

Definetely yes.
When I saw the structure my first thought was: Banana! If there is no need for a curved wall no architect ever would build one. A straight wall means a shorter wall, less difficult, less expensive and more inside volume.