George,
I think you've made the right decision. I knew a few people with "Federalized" late model cars. None of it went well. Thanks to a few "butcher shops" in the eighties,it's always more $$ and paperwork than it's worth.
Regards,
Randy D.