Volume pot on pre does not have detents (would/could changing the volume pot to one with detents, give better control?)...No. You have more control when its continuously variable.
I'd back off on the amp volume controls, maybe to 3 o'clock, and see what you think. Listen to how it sounds and also where your master volume control sits.