A 300l tank already requires much less space than 1x180 + 1x120. But I think you should have understood the main part of the solution (Pufferspeicher einfach weglassen) by now...
Maybe a combination storage tank would be a solution? We are getting a Juratherm HDWPU 400 (300l hot water + 100 buffer storage). Has anyone had experience with Juratherm?