4.7L shift and TC lockup points... When does yours shift?

I'm trying to figure out if my shift points are off, or spot on. Here are mine (warm engine, driving normally, after a week of normal driving)

EDIT: 2002 Jeep Grand Cherokee Limited w/ 4.7L HO and Quadra Drive

1st -> 2nd : 2300 RPM, No torque converter lockup

2nd -> 3rd : 2100 RPM, No torque converter lockup

3rd -> 4th : 2000 RPM, No torque converter lockup until 46 MPH, then locked up solid unless a solid press on the gas pedal.

O/D cutoff switch is working properly, and TC Lockup occurs at ~30mph

I have been attempting to drive 'with traffic', not flooring it, trying to keep gas mileage right at 15mpg with an average speed about 30mph.

I have a new TPS, and a clean IAC. Stock everything. Speeds confirmed via GPS app.

Also: I think its odd that the torque converter doesn't lockup in the 30mph range. It would be really useful, since the engine gets into 4th gear and just seems really mushy between 30 and 40 mph. Just feels really mushy, I wish it would lock in and use some torque instead of changing RPM between 1500 and 2100 RPM.