But now everything I can get uses built-in battery design - which solder the battery directly onto the board, which makes the difficulty I mentioned...
The main issue is on the PCBA If I had money to design from scratch, I will make it "removable battery friendly" and the follow up design is easy.