I think Disk Utility on the 10.5 DVD can remove the bootcamp partition and expand the OSX partition. It does carry risks though.
I would install the 10.5, do a Time Machine backup, then restore that backup from the install DVD into a brand new full partition or resize it from 10.5.