This is where I'm having trouble, because
1 rev/sec = 60 rpm, so I'd say:
P = 2T.pi.60.N
but in the textbook and online it says P = 2(pi)TN/60 so I'm not sure what's going on...

I'm glad you realise where your difficulty lies since your foregoing analysis is correct if somewhat roundabout.
However your intial data says the shaft is running at N rpm
By definition this is N/60 rps.
So your f = N/60 and you must substitute this for f in the equation you have developed, not the other way round.