I ended up using the bicep's Toyota Red 3E5, which I was told was fine at the time. I'm not going for Level 2, so I'm not too concerned.
Good catch on hand plate, I hadn't thought of that one. The change seems doable. It's a BSP piece, so I'll probably have to cut into it with a Dremel, built up with some bondo behind the edge.