Most likely!

Also, you're right to think he wouldn't want Ragnar to make Floki suffer. Maru and I actually have a pre-written thread where he a) refuses to tell Ragnar who killed him but b) accepts that he'll inevitably find out and then revenge will happen, but asks Ragnar to do it in a way that still gives Floki hope of Valhalla, because he's forgiven him.