Water Pump Removal! Any tricks?

1993 Cadillac Sedan Deville. 4.9L V8. I'm replacing the water pump. The book says its supposed to take 2.5 hours. All it says to do is remove the upper water pump bolts and then raise the vehicle, remove the splash shield, and then remove the bottom bolts. I don't find it that easy. I spent 2 hours today and I still haven't even gotten the water pump off. Is there any "tricks" to getting the water pump off and on easier and quicker? Its just a hastle trying to fit my hand down between all those tight spaces. It's really time consuming. Let me know. Thanks!

i take the motor mount loose and jack the motor up to get the top bolts, then let it sag for the bottom ones. 1 of the bolts is a torx if i remember right. its easy to overlook.

Yeah actually I think there are 2 T40-sized torx bolts. I got them already. Its just hard to manuever around all the a/c lines, alternator, ect. The book says 2.5 hours. how is that possible?

ya its a pain what i did was take out the battery, overflow tank, and front passenger tire, but after that it wasnt too bad, although there is about 15 or 16 bolts holding it on, i never took off a motor mount, although plp suggested it to me, just be sure not to remove the timing cover bolts that are right next to it