Really appreciate the replies from all of you. I think now, with the current status of covid and everything, going abroad to get it fixed isn’t really an option. At least not for me. Maybe I’ll look into it when things calm down a bit. In the meantime I think I have to carefully decide on what to do. Maybe I’ll be my own guinea pig and see how a very conservative approach to normal ndl diving would work out.
Actually NDL diving can be more stressfull and dangerous than deco diving properly planned with adequate conservatorism.
Most people think, wrongly, that staying "just within" NDL limit is fully safe, whilst going into deco realm is "tech" and much more dangerous.
If you read in previous page, another diver with PFO reported to having been slightly bent on dives on the edge of NDL (slightly within or slightly beyond), and instead no problems with much longer dives with long planned deco and very slow ascent.
I have also a reasonable explanation for this, based on the fact that for long deco dives the commanding tissues are the slow ones, which have less interaction with the presence of a PFO.
Instead diving with NDL the commanding tissues are the fast ones (where blood perfusion is strong), hence the presence of a PFO is more strictly affecting the risk of DCS.
So, in your case, simply staying "just with NDL" does not appear a "safe enough" approach.