I propose this new starting point (I started from a working branch, and reorganized all the modification on 8 commits, each modified file is within only one of these 8 commits).
1- Infrastructure and database (v32, iCfg, new Interfaces for PumpRate, PumpInsulin, uel update, ...)
2- Profile updates (dia removal, add iCfg management within EffectiveProfile, ...)
3- Infra Pump, PumpSync and Bolus (add the new Layer including PumpWithConcentration, ...)
4- Pump Driver migration (all modifications on Pump driver to manage profile, PumpInsulin... is grouped within this commit)
5- Algo APS, Iob/Cob an automation, new management of IOB calculation with iCfg included within boluses
6- Insulin Plugin refactoring (one single plugin, InsulinSwitchDialog and ConcentrationDialog to manage switches)
7- update of all remaining plugins, and user interface
8- one latest commit to fix all (I hope) tests (probably the biggest commit due to number of tests impacted)

This has been done to facilitate review by theme, hope it will help. So all these commits work together (I didn't try to build intermediate steps but it will probably failed due to all cross connections).

All my work has been done using your commit AS data flow as starting point.

• my first rebase on IOB COB graph worked perfectly without any conflicts...
• I propose to continue my work on this branch, and will rebase regularly on compose
  Feel free to comment ;-)