Don’t know your goals (nor your personal situation, only you know that best) but going off what you said I derive you’re looking for dividends and growth (so total return). I will not say that any portfolio is good/bad as the same portfolio could be really fitting for me but a complete disaster for you (investing is quite a lot of emotion), not even considering time horizons.
If you have over 20 stocks you could be considered diversified (won’t go into any details here already did that in another post), having ETFs will likely produce a similar result. Historically only a small percentage of stocks accounted for the entirety of stock market return, thus owning everything, in the end, is the best according to science. But if you actually get that average return is mostly dependent on your emotions, not your actual investments. The most important thing is not if you might beat/underperform the market by a small margin, its that you keep investing and are in the market!
A good analogy is the loan one: mathematically it’s best to pay off highest interest first but in reality, what works best is paying of the highest emotional burden debts first.
Same could be said for stocks, theoretically it’s best to just have ETFs but it could be that you will stick more with your strategy if you know what you own (try doing that with an ETF of 1600 holdings) and staying motivated to put money into your investments.
For myself, I have found that getting dividends and owning individual companies provides a great mental boost (even though I know that I’m likely to underperform my ETFs), but I still have 50% in ETFs and spread my individual stocks (I have about 50 individual stocks with no single one being more than 2.5% of the entire portfolio, so basically an ETF as well, spent a couple of months this summer building that portfolio).
And you said you’re in spain, I don’t know how cap gain taxes, wealth tax or dividend taxes are there so that also should be accounted for when you choose your investments.
It’s a bit late so I hope what I’m saying is coming over coherently, I should probably stop procrastinating and actually finish my assignments 
Edit: just saw you added answers to the questions, going off of that I would suggest going for a dividend growth combined with the regular market/growth (so overall reasonably low yield but higher dividend growth). Companies that might interest you: Visa, Mastercard, Prologis, Thermo Fisher, Sartorius, Adyen, ASMI, BESI, ASML, Merck, Abbvie, Next Era Energie, Ecolab, DLR, EQIX, CONE, COR, SBUX, AFL, WM, ADP, BLK, AVGO, ADI, TXN etc.
or a big 
