10 gallon till this summer and then the custom (I'm assuming MUCH larger) set up.
A 20 incher should be fine in a 10 gallon for a couple more monthes, I put my bp in a 30gl sometime around 20 inches and he eventually became less and less active, could be the season? could be insecureness from all that room!