Local dive shop
Took my system down to same local dive centre, another guy filled it and said all the standards are in place, no problem.
Will try and avoid the other bloke like the plague.
Also been advised by the paintballing world in general, that as well as the EN standard it has to have the PI symbol mark on it. Not sure what that means and what it corresponds to exaclty, but apparently it is important.