Escape Cake and Survivor Pudding rework

Currently, Escape Cake and Survivor Pudding are 100% BP bonus, all categories, to a single player.
But each side has a "25% BP at all categories" at the same rarity level (not to mention 100%-bonus-in-one-category ones). More importantly, neither of the cake or pudding seem like the right mechanics, at least with the name.
What I'd love to see is:
1) Hollow Shell and Yellow Envelope basically get 100% BP for one player, as Cake/Pudding are now.
2) Pudding becomes:
Survivor Pudding is more delicious the more survivors you use.
Earn 25% bonus to ALL BP gained in the trial for every survivor killed (DCs count as kills).
3) Escape Cake becomes either:
Escape is sweet. Every survivor who escapes gets 100% bonus to all BP earned in a trial. Those who do not escape get no cake.
or
What's a party at the campfire without friends? Earn 25% personal bonus to all BP for each survivor who escapes the trial.
I like the first version better, but the second is more 'fair' compared to the killer offering. However, the second would probably be way more tricky to program (if you die or leave first, how does it know who escapes later in the match?) so probably sticking with the first version is better, or maybe adjust the percentages to compensate.
In any event, each would now add an element of risk vs reward, which justifies it as being at the same rarity level as the 100% bonus offering, and alters gameplay behavior (survivors might play more conservatively to ensure their slice of the cake). This does mean overall more blood points given away, but grinding is already difficult and with 6 new perks (3 levels each) added for each new chapter that seems like a benefit more than a drawback, helps take the edge off.