Have you checked out Kindermusik???
www.Kindermusik.com
I took my son to the Cosmo Music - The Music Garden when he was 18 months and we had lots of fun. They have classes during the weekends so my husband and I alternate taking the class with him on Sundays. He really likes the teacher there and learned a lot. Here the link to their classes - http://cosmomusic.ca/school-of-music/group-programs/the-music-garden.html