I hear ya, Bob. the lithium batteries WILL make you smile
I made the same mistakes with Ryobi. I work hard and I'm hard on tools. Ryobi is likely fine for the typical home owner, but most of their products just don't last for me. Three NOTEABLE exceptions are ($79 when I bought it) is the belt/disk sander combo, the BT3100 table saw (No longer available) and, believe it or not, the $89 scroll saw. The scroll saw WILL take pinless blades, but they are hard to find and hard to install!
HD here had the DeWalt scroll saw on sale for $299 on Black Friday, they were gone (at 5:30 am, I took the wife to work), I got a "ticket" so EVENTUALLY, I'll get one.
I am fond of "BIG RED", I've never had one fail, no matter how I mistreated it.