Should I Upgrade My Table Saw?

Hey everyone! I've been into woodworking for about 16 months now, operating out of a long, skinny basement workshop (around 8x20 feet). I started with an older Bosch 4100 ten inch table saw. It's decent, but I really struggle to tune it in properly. The angle adjustments are frustrating, and the riving knife doesn't align well with the blade, which has led to some close calls with pinching. The saw also feels too big for my space, although I do appreciate the rip capacity. I usually make smaller projects like boxes and shelves but plan to tackle some medium-sized builds like outdoor chairs and end tables come spring.

I'm considering an upgrade but while I'm willing to invest—let's say under $1,000 CAD (around $700 USD)—I don't want to splurge foolishly. I'm more focused on user-friendliness over sheer power. I'm working with 120v, but I have the setup for 240v. I want a saw that offers easy angle adjustments and a fence that won't drive me crazy. I like the 10 inch blade since I don't have a bandsaw, though I'm open to a smaller size. I've thought about getting a SawStop saw, but the contractor size is out of my budget. Any advice or warnings?