Getting Better Lyrics

Check with record for timings
Intro and verse riff (how Joe Johnson played live)
Lead in by playing E5 for a few strums:
A-2-------------------2---2-3-5(hold)-5-3-2-0--------|
After repeat:
Solo (not completely correct):
G-2b4r2-0-------0-2-| x4
D---------2-0h2-----|
Any comments? Suggestions?
Email me at jamesdfoster@hotmail.co.uk