I understand this frustration, it comes from taking the same part off repeatedly and not getting everything taken care of. Luckily, the instrument cluster in these cars is very easy to remove.
If you will keep up your perserverence, I believe you will reach a point where you're driving down the road one day and it will occur to you that you haven't had the dash apart in a long, long time. These kinds of problems come in cycles, regardless of what car you're driving.
Hang in there,