Go with the volume the recipe you are using states. I would also dry hop as recommended in your recipe (will give you more hop flavour/aroma that just the tins).
A lot of the kit & kilo style recipes are based on 23L as typically people who brew this way are packaging their beer in the PET...