why not both ?
i assume its an hastily assembled wip picture just to show how you are going to do stuff, however:
2 doesnt have chimney nor campfire, give it campfire too, 4 doesnt have chimney.
in my opinion it could go from 3 to 5 straight, with the new 5 being where its turning entirely fortified.
2's hayroof seems to be clipping through the frontal wood frame,
the windows are as large as the door if not even larger, you may want to shrink them a bit.
its weird that the building goes up in levels supported with framework and then gets it taken out later, which is whats happening in 4 and 5, also i doubt the base is strong enough to support such solid stonework above, seeing how you havent reinforced it.
lastly id like to put that it may appear too tall when complete upgraded as its remaning an strict square foundation, you can try to add an tool-shed like extension(that would exceed farm's but not orc burrow's pathing texture) to one of either side that goes like:
3- gets added and is wood
4- is upgraded to stone
5- gets upgraded with an extra level
you can try using the grating from your custom coloured cathedral windows into the window so its no longer opening into black space.
if you would like to add extra eye-candy can hang one lamp somewhere at front.
