Hi, thank you for your contest and congratulation for the coming baby.
From the plans you provided, it seems that your friend has drawn every possible option and the one you chose is the best one among them. However, based on your requirements I came up with another option that I send it for you.
I tried to design the project in a way that best suits your requests in order to achieve the best interior relations and functions.
Thank you