Hey,
First of all... i think your network like you showed it in Fig1 would be fine. Cause i think if youre really setting up your home office then this should do the job. Another reason why i wouldnt go to far with this stuff is because troubleshooting will later become a real pain (in my opinion).
Let's compare the graphics a bit.
In Fig1 you assigned every componnent in Line which costs less installation work, less configuration work,.....small and simple, thats good.
In Fig2 you assigned every componnent in a star topology(physically)...and then you configured it to be in line(logically) like in Fig1 which takes a lot of work.
so basically Fig2 is the same as Fig1 just way more complicated, maybe even more unsafe and causes a slower network.
I think you should go for Fig1 and if you really really really really want to improve you can still use subnetting. Heres something for EXAMPLE:
Like in my graphic you can assign adresses 10.98.34.65/30 and 10.98.34.66/30 to subnet 1 and adresses 172.16.43.221/30 and 172.16.43.222/30 to subnet 2