Yep, join the club. I'm surprised you haven't pulled the dash completely out yet....aren't you putting in a whole new dash eventually? Even if you weren't replacing the dash, the wiring under there is likely a mess, and you would want to get all that fixed up/cleaned up/etc. If you don't have the FSM and wiring schematics yet, you can download free FSMs for all years here: https://www.xenonzcar.com/s30/fsm.html
You're making great progress....keep it up, and please keep the updates coming!