Definitely go vertical with maybe a caticornered perch or two, though it’s probably just fine the way you have it. I like your water set up - do you have electric or did you have to run an extension cord?
I‘ve found rearranging old stuff makes it new and interesting for the ladies. That, and...