Been there, done that too!
After trial and error we ended up buying a double foam mattress from Para Rubber (the thickest we could get). We tried it without squabs underneath but it was more comfortable on top of the squabs. We now get a great night's sleep!
Ros and Bruce