Obviously it is your own decision on how you proceed.
I have (to my considerable cost!) recently found out how little a "permission" is actually worth.
Have you considered whether your contents insurance will be valid in the event of loss from a building without relevant compliance?
Regarding the processor, as you will find reading many threads here, the view is that a 568.2mm(software at v2.5 beta) is superior (not just in sound quality) because it can interface with an HD621 and thus give you HD soundtracks from Bluray.
Given the undoubted quality of the rest of your system, I would consider an early replacement for the doubled-up Matrix HTMs as the priority.