I made all the modifications today, and powered it up. No smoke

The true test will be testing it with a load on it (the pump). I'll try that out later tonight.