Thank you to everyone. To summarize, if I want to clean up this swap properly, I need to get a single pulley alternator, proper year water pump, and proper alternator mounting brackets. Do you know if I also need to swap the crankshaft pulley? I will likely want to replace the fan clutch while I'm in there.