Sourcing upgrade parts (L96)

[tolucophoto]

I've just bought a Warrior L96.
Fitted some homemade barrel spacers and I'm planning to get a tightbore barrel and a new hop up, because mine is a bit inconsistent but also because part of the black plastic hop up lever has snapped, so ive had to tape it to keep the collar on.
Can anyone direct me to the right parts to get? I'm having a lot of trouble sourcing parts to fit.

Looking for an HP or PDI hop up, a 6.03mm barrel, hop up rubber and any other parts I need.
You can PM me if its against the rules to post links.

Cheers