Sounds like everything is going good!

For the tank height is really as important as floor space, my PVC cages range from 12-14 inches tall, so if the 30g has the same floor space as the 40g but not as tall I would go with the 30g.

Sent from my SAMSUNG-SM-G890A using Tapatalk