Even more vehicle redesigns (WIP, requires #3898)

Finishing up the vehicles that didn't get rebuilt the first go-around due to armor issues.  This requires #3898 to work correctly, if that goes through any changes before it lands I'll adjust this to fit.