Definitely a viv!
aquarium = water
terrarium = land
vivarium = habitat to reproduce a natural environment (often arboreal or forest floor recreations, some water)
paludarium = natural land habitat and water habitat (similar to riparium)
riparium = meant to resemble riparian
environments, or river banks. often "farmed" more w/ rafts and planters and the like
Anyways, cheers! Looking great so far!