@farkas where I ended up more or less. Overall a much more compact setup.
And for a smaller rack I didn't want to go for such space eating oscillator (nevermind that the RS Serge NTO and the Generate 3 equal the size and cost of a Brenso. The NS Serge modules may make their way into an all Serge skiff at some point – I was intrigued by the rather old-school spacious panel layouts and do like the Serge sound).
Still weighing a Contour 1 vs a Falistri and whether I'll really use the FH-2 that much, or the Sapel for that matter. I definitely agree about the UI of Frap Tools panels (though I've also read they do, eventually, make sense)