Modified as requested.
If first floor and second floor are aligned on the exterior will maintaining proper East setback.
Option One
Option Two
