I have no real advice to give, besides the standard sentences such as "Do what you like best" or "Follow your heart". So I'll shut up and just say that I hope talking it over with your old supervisor will help!