I highly recommend A Traveler's Guide to Spacetime, by Tom Moore
(McGraw-Hill, 1995). It develops special relativity from scratch,
with great care, using spacetime diagrams throughout. Hope this
is what you're looking for.
Dan Schroeder
Weber State University
dschroeder@cc.weber.edu