i wouldnt let re shelling it stop you mate! its hard to find a mint shell without paying top dollar for one! im in the process of re shelling my 3i into a 1300 shell! didnt want to do it but i love the mk4 too much to even consider another car!
it is very time consuming but its worth it in the end!
good luck with what ever you decide!