I'm not sure about the compatibility of the later screens, I would think unlikely as the later models had a different TFT dash.
I think an awful lot of contributors here have spent vast fonts of money trying to find the perfect screen.
For many, me included, the best answer is the Madstad screen, some think it is fugly but it sure does work!
They do come up from time to time secondhand on this forum and ebay and that would be my recommendation.