Ok, had a play with some more CAD :)

Deleted the side rails & related
Got rid of the aluminium bed
Added more bars for a new bed
changed the rails for slightly longer ones
Added bolted section to allow fine tuning of angles


Some pics: