Oh, HELL yes! This is classic James/Sirius!

he’s pretty sure he wants to kiss Sirius a little and then punch him out a lot.

Exactly, that's exactly what I love about this pairing. I like how you've remixed the original to James's POV, but kept all the anger and confusion brimming just at the surface between them. Nice job!