The stress tracks from FATE might also be more suitable, if you can find a good way to port them over.
Consider switching to a system that places more emphasis on danger, such as Harnmaster (known for being both dangerous and simulationist).