I think code visibility is more important (intention revealing). It allows you to move forward (with proper abstraction) while still provides a chance to refactor later. DRY and Boy Scout Rule should always be honoured.