Baby name dilemma!!

I'm stuck on what to name my little boy! I have two names that my partner and I can't decide on! Flynn was our first name picked but we told everyone that was going to be the name so now then I thought of Oliver/Ollie so then it would be more a surprise what we call him. Only thing is now someone has mentioned that Ollie reminds them of someone we know (not well) who I don't like and now I can't help but think of them! I need some help deciding or some more ideas! I think his middle name will be Thomas after my Nans brother, and his last name is Reynolds!