Thank you so much @impeeza, walked through the steps this weekend and have everything working perfectly on FW21.2.
At the end of the guide it did say "as you are getting a new set of binaries, you need new set of sigpatches" but I was able to use the sigpatches linked in this post without...