Been there, done that
Like you, I reworked my high current component layout to provide better clearances. It took a few extra hours, but I'm glad I did it. I gained some extra serviceability out of the deal.
It's amazing how much time it takes to plan and execute a firewall forward installation. I've always wondered how much time we could save ourselves if we'd all settle in on a standard layout.