Combine G1 and G2. Make a pool of items for certain class to take any 2 of any gadgets available for class. For example hammer and landmine or 2 ammo boxes large and small.
#Gadgets 1 and 2
grave haven
near garden
Being able to carry 2 RPG heats, c4 and landmine, etc. seems like it would create lots of problematic combos