I voted for the 40 gallon, only because the OP said he would prefer something larger for a display. I think a 20L would be fine for any male, but a big female might be cramped. If you do use a 40, I would divide it for a while.