those shapes look better. appears you've managed to keep all the lines perpendicular in them.
go with the one you find easier to draw, just make sure all perspective is done on the same plane or you will get one wonky world. you can sometimes get away with fudging perspective on some pictures, doesn't work for every drawing though.
ciao