I don't immediately see a problem, the difference between what is there now and what you are proposing doesn't add up to much in real terms. Henley blocks and short extra tails doesn't really change that much.
There isn't a 3m tails limit in BS7671, to the best of my knowledge, it's a rule that DNOs have and I don't imagine you'd be wildly exceeding it.
I was also idly wondering whether there's any desirable way to do this all-in-one enclosure, e.g. I don't know what the fuse rating was protecting the splitcon but wondered if a suitable fuse carrier in your new CU would be available. Or (definitely 2nd choice) a type C MCB if manufacturer tables say selectivity is achieved between it and the highest rated downstream MCB. Just thinking out loud, splitting tails is probably easiest.