Nice getting better, that tapping part is indeed very crazy but if you have a really hard time with that or other stuff then watch Tim's short where he plays it and slow it down and look how he puts his fingers on the fretboard and thumb placement and then copy that exactly. Its what i did with the parts i struggled with and it went better. Btw the right thumb placement is very important with this song so try to find the most fast and comfortable place