Once the relief has been given back, you could discuss with your financial broker the possibility of the PRSA company setting you up with an AVC PRSA, rewinding contributions made to your PRSA for the past 18 months and transferring them to your AVC PRSA. They might or might not agree to it, but if they have proof that you didn't receive tax relief on the PRSA contributions after a certain date (because you gave it back), then it might be a runner. Seems a shame to have made contributions and not to get tax relief on them if you were eligible, but just in the wrong product.
Anyway, discuss with your financial broker the pros and cons of setting up an AVC PRSA for future contributions.