Thanks very much for the work davej. Looking forward to testing it out.
Would you say this shader is suggested to be used in place of your original whether or not you have a Pi2? Or is the original better in any way for Pi2 users?

Thanks again for your time.