Hello. Thanks for mapping.
Somewhat difficult task.
Just map the round buildings as a circular building. When there are object close to it, just map it next to it ( rectangular) 
Square all rectangular buildings please.
Best regards