In recent years, important regulatory changes have been introduced in Spain in the fields of self-consumption and energy tariffs. In addition, electricity prices have risen sharply, reaching record highs in the last year. This evidences the need to conduct new research studies in order to provide an accurate picture of the profitability of battery energy storage systems and photovoltaic systems. This paper proposes a complex simulation tool developed to assist in the optimal design of these kinds of facilities. The tool is used in this study to analyze the benefits of including batteries in PV systems under different self-consumption models, different consumer profiles and different locations across the country. The research results indicate that at current electricity prices, the use of batteries is less profitable than selling excess energy to the grid, unless the price of batteries drops drastically by more than 50% in all the cases analyzed. However, at current battery prices, they become a valuable resource in facilities that do not feed energy surplus into the grid.