AAbot a man who dies and goes to heaven only to fall in love with a woman there, they live happily in heaven until the woman is told she has to return to earth. The man is upset and makes a deal for himself to return to find her but is only given a number of years to do so. Please help me find this film

Made in Heaven (1987)
Starring Timothy Hutton, Kelly McGillis
IMDb synopsis:
After being dumped by his girlfriend, a boy runs away to California. He ends up in Heaven because he dies while trying to help a family from drowning. He meets a beautiful girl who has never incarnated before. When Annie, who is curious about life, is sent to Earth for her first go-round, Mike pleads with the man in charge to send him in his next human life at least to the same country so that he can find her. However, Mike is given only 30 years to find Annie.

http://www.imdb.com/title/tt0093467/?ref_=fn_al_tt_1

Thanks Myst!

Thanks Myst!!

You're welcome!