Need to replace bathtub faucet this winter

When this house was built the guy that built it took the large sized bath tub my parents had and installed it with no shower over it. My mom was not amused and asked him if he could at least install a hand held shower on the faucet. He said "they don't make such a thing." ..... yeah. Right. We did not believe him either. My mom informed him she wanted him to install a hand-held shower fixture even if he had to buy a kitchen sink, she knows they have the dang things.

Yup. You guessed it. He put a kitchen sink faucet in our bathroom for our bathtub. Don't believe me? May I present my bathtub faucet - which includes now the shower-head extension my brother added to the hand sprayer for us.

I am definitely in the market for a new bathtub faucet, been too long since that was installed and we are well past tired of filling the bath with a kitchen faucet.

I want to get one of those fancy clawfoot tub style bath faucets with the sprayer on a cradle over the faucet. I think that would be the best option for the tub that we have. Then install a walk-in shower in where the washer and dryer are now when we finish the laundry room.

I plan to redesign the bathroom this winter, moving the washer and dryer into the new laundry room in the spring, so I need to decide just what will be best in there and I can finally get that ugly kitchen faucet the moron contractor put in there replaced.