Baumann continued his swimming career with three gold medals at the 1986 Commonwealth Games in Edinburgh in the two individual medley events, and swimming anchor on Canada's 4 × 100 m medley relay team. However, later that year, he won a silver and a bronze at the 1986 World Aquatics Championships in Madrid, Spain losing to a 19-year-old Hungarian swimmer, Tamás Darnyi.