"Pilgrimage" and "Heroic Deeds" Achievements broken, any solution to this?

These are the achievements for playing a game to completion on each of the basegame maps and winning a match on each of the basegame maps.

What should I try next? Did these achievements/trophies eventually unlock for you guys?

We definitely played on each map at least twice so I should at least have Pilgrimage.