Personally I feel you are good at OPTIONS ,please stick to Options rather than Equity.If you have other plans .please go ahead.
I think in case of TataMotors, I have underestimated the impact of the margins due to their international business (JLR). Domestic level, they are doing reasonably well.
Anyway I am planning to hold the shares (entry @ 180) for some more time and see how it goes. In the mean time, I can get some of the money back in the form of OTM covered calls.
In case of INFY, my entry was quite good and I entered at around 900 level before stock split and hence break-even is 450. This also, i am able to recover a portion of the money till now by writing OTM covered calls.