I think you ran through much of this before in this thread :
https://www.askaboutmoney.com/threads/contributing-to-an-avc-what-if-i-dont-retire-early.218938/
As a post-1995 Class A PRSI public servant, and given your previous information, you should not have any difficulty with overfunding via AVCs. Once you top up your tax-free lump sum to the max you can transfer the balance to and ARF to draw down flexibly. The issue you need to consider is whether you and your wife are likely to be top rate tax payers in retirement, and whether it is worth funding an AVC towards an ARF in the event that you are.