Sounds like you did just great, The wiper motor might be a DIY project but it depends on how much stuff is blocking it. There was one bolt on our old Mazda that was tricky to get at and we went through all that work to find out that the problem was in the wiper transmission. Motor was working fine.