I started work on this some time ago (
topic here ) and never finished for 2 reasons; one I cannot model or skin and 2 it got too complex (adding 1 new general for each side).
Now I am going back to my original idea of replacing demo. I will keep the exploding Rebels, RPG troops, and kell (with charges too) but those will be his only infantry. I might keep it so the terrorists still come with the bikes tho. But no mob, hijackers, of sabatours..
As for vehicles; none can suicide but all will has 3 lvls of salvage upgrade (except the bike) . They will be built at lvl 1. buy time they reach lvl 3 the explosives will be as power as demos. Its a way of adding more salvage stuff and still keeping demos firepower

(buggy ammo and bomb truck upgrades will be replace with salvage ones. Radar van will have salvage armor upgrades)
In the end who actually used the suicide on vehicles and building anyway. Ya angry mobs, terroists and the Demo's scudstorm (will have normal one) will be gone. Maybe some other stuff but balance is an issue.