Proud mummy I couldn't agree more about not worrying too much about bad habits even though I was 100% the same as you and I was constantly worrying about that awful saying 'making a rod for your own back'...
I've honestly found that any 'bad habits' DD had picked up with sleeping issues (and she had plenty of bad habits, believe me!) have all been astonishingly easy to crack with the right techniques at the right time. I cuddled DD to sleep for 11 months and within 4 weeks of starting sleep work she was going to sleep every night on her own- happily... I was paranoid about co sleeping being a bad habit (but it was literally the only way she would keep after her 11pm wake up every night) but we stopped that (again happily) after about 6-8 weeks of starting sleep work and now she only comes into bed with me if she's ill or teething or I fancy a cuddle because I actually miss it
She was a dire napper and like your LO only napped for thirty mins a time but actually that just improved with age, I think 7 months ish she just suddenly got better at it and went for mammoth sleeps mid day all of a sudden (I think that is quite common?) so that improved on its own anyway (though again I do know how wretched it is to have someone say that when you're desperate!!)
No cry sleep solution is really worth a read I think, some good tips even if (like me) you are just way too tired and demoralised to start the actual programme she suggests.
Good luck though OP I honestly am sure you will see a huge improvement with just a bit more time and maybe some help when you feel it will benefit you best.
Xx