Good news! I fiddled with the farm a bit more in creative and all I'll have to do in survival is move the beds up a bit and make sure all the work stations are connected to the right villagers; squids, drowned, cats, and possibly glow squids can also spawn in here