Lower stack height stem and headset are the only save solution .. your Elite is 45mm high? the Elite X2 if you have to have Thomson is 36mm clamp height so that's a 6mm gain .. if you have to keep the forks then you need to do some research on stack heights, but by the time you've spent out on more stems and headsets I'd suggest you may pay for another fork!
Lower stack height stem and headset are the only save solution .. your Elite is 45mm high? the Elite X2 if you have to have Thomson is 36mm clamp height so that's a 6mm gain .. if you have to keep the forks then you need to do some research on stack heights, but by the time you've spent out on more stems and headsets I'd suggest you may pay for another fork!