I recall taking out my gauge cluster on the E36 M3 to replace some bulbs as well.
Yes, it was a pain in the ass and felt that it would have been easier to take off the steering wheel. But after a second and third time, it was much easier. Practice makes perfect.
