Could you try playing from an earlier save (before the final graveyard visit with Heath) and let us know if you're still getting the Mavvar/Randal ending?
Restarted the game and then tried again, at an earlier save like you said. It worked this time and I got the right ending.
