Sadly although suspend/wake was working when I first rebased to bluefin, it has since become broken again. Manual suspend seems to just shut off the laptops screen and does not allow it to turn back on, requiring forced power off.
Not sure if maybe enabling secure boot broke it again, or something else? @tulip