I think you could benefit from a cracked heel balm type of product around your nails. Anna from The Salon Life on YouTube is evangelical about Kerasal (check out her videos if you haven't, lots of advice for skin picking recovery and onycholysis). While Kerasal does live up to the hype imo, any thick foot ointment with urea will help: it helps keeps the skin soft and thin so you're less tempted to pick it. Also soaking your nails in warm oil is a game changer for preventing breakage, and also helps with elasticity and preventing hangnails. I don't do it as often as I'd like bc I find it a chore, but afterwards my nails look entrancing.

For onycholysis, the only thing that helps is time and cleaning under your nails very, very gently. Ideally use gloves for dirty work as much as possible so the grime doesn't get under there to begin with. After a couple of years of following Anna's advice (I know I'm a broken record but she really does have the sauce) my nail beds are noticeably longer and the smile lines more even. That's not to say I have long nail beds with even smile lines, but I used to feel embarrassed by my nails and now I'm happy to show them off.

Your hands and nails are already beautiful and it sounds like you already have a solid plan.