Lets keep the chemistries apart here.
LiPo (as the title states) are _soft_ foil batteries, typically found in cell-phones and the like.
18650 are LiIon, which have a _hard_ metal casing.
For LiPo batteries, you would need some kind of protection to prevent accidental puncturing. The outside of your device is usually enough to accomplish this.
For LiIon, there's very little you need to do mechanically to make it safe. You could go the extra mile (as suggested above) to make sure that if all your protection circutry fails, and the cell de-gasses, that the hot gasses can't harm the end-user or damage the product. However, I doubt that would be a requirement for UL.
For the electrical, it seems you have most of the parameters figured out, but I'd like to mention some particulars that a lot of people seem to forget.
Temperature. This is very important. If you go below a certain temperature (datasheet says which), the device should stop draining power from the battery. Same goes for too hot.
This also applies to charging. Going outside those temperature ranges will at best shorten the life of the battery, and in worst case result in de-gassing or swelling.
If the battery is end-user replacable, you'd might want to design in some rudimentary identification circutry, so that the user doesn't replace it with something just similar, but something that actually works.
Also, remember, there are many different cell-voltages, even within each chemistry.
Li-Ion is available in 4.2V for the most part, but others are available
Li-Poly is available in 4.2, 4.25 and 4.35V
Last little comment would be that after charging completes, charging should _stop_. It shouldn't have the current slowly peter down to near nothingness, as that would "polish" the cell and also reduce its lifespan. Charging should stop, and only recommence when the cell voltage has dropped to a certain level (for example, 4.1V for a 4.2V LiPo cell).
But, it all comes down to your own decisions on what's important for your product, and how much effort you're willing to put into it.
Source: I worked with batteries and charging in cellphones for quite a while. We did it all, and then some..