Vacuum the bed mattress thoroughly after the wait, and do try to get all the baking soda out of the bed mattress, otherwise you will have to wake and sleep up in a bed of "snow".
Eliminate the old waterbed bed mattress and purchase an air bed mattress to fit into the waterbed frame.