Greetings, sorry about your pain.
what you did is good - ice, hot pack, yoga but with repetitive computer job you tend to activate the muscles which creates spasm. There are muscles in neck and upper back that needs to be relaxed at all times and if you engage them, you get pain stiffness, hence you problem is still persistent.
Next Steps
You need to see physiotherapist specialised in posture correction and trigger point therapy. they will help you relax overactive muscle and strength muscles which are weak, trick is to identify which muscle is weak which a physio can do better.
Health Tips
regarding PCOD, never declare it cannot to cured, it is just a lifestyle problem rather than a medical issue, change your diet pattern, see a dietitian to cure it rather than gynecologist. if you want to learn more about PCOD or neck upper back pain do let me know will assist you.