Photos would be a help, but as slips has said can DB1 not be reconfigure to be a high integrity board, where the first way after the main switch is in fact just an mcb?
The mcb would then be the ocpd for the sub to DB2 (dependent on the installation method used for the sub of course).
AS the installer the easiest way forward for you would be (as slips has again said) change DB2 for a non-rcd board & rely on the rcd located at DB1. will be a pain in the bum for the flat tenant if the rcd trips & the shop is locked up.
Me I'd have split the tails plonked in a sub meter, put in a correctly designed submain & used an all rcbo boards in both the flat & shop...................................but that's just me & having had a few years at college & on the tools before taking money off Joe public to do their electrical work.
You CAN NOT learn all that is needed to work in this trade by taking a fast track 5 week course, but at least you will get the basics (discrimination included hopefully) & you will definitely end up in hot water trading with only knowledge gained from forums.
So I think I've given enough info to you on this job & fulfilled the forum obligations of being polite & helpful, but you do need to go & get some recognised training........cant believe I'm going to say this......even some 5ww course might help you not cause death & mayhem by poorly planned & executed electrical work for your customers.