could try the mathematics via problems series by skopenkov as well. Has algebra, geometry, and I think a combinatorics book coming up soon.