The other (better) option for the fan shroud not lining up is to get a motor mount lift. It'll line everything back up normally, but it will also help with your driveline angles and you get new motor mounts out of the deal. That's the route I went, just thought that was worth mentioning.