The RIS being missaligned doesnt really annoy me too greatly. If I could get the outer barrel out of the upper receiver I would try re machining it, but I cant get them apart for some reason.
Ive now got the fps sorted, a tight-bore barrel, Prometheus rubber and nub in there and its performing great. Very pleased.
Will have to get some updated pics up.