I think I have OCPD and/ or AvPD?

It's not a good idea to try to self-diagnose because it can be completely inaccurate. If you are worried that something is wrong, go to a psychologist or psychiatrist. They have the tools to evaluate your situation and decide if it's anything that needs to be worked on.