Definitely more wood... that should fix the aggression. More than enough tank space, its just finding that right piece of wood. For now, if you can get some rock work, or even a cheap statue that has a large enough cavern that could solve the problem until you find the right piece of wood.
