My 06 Rubicon runs great but will someday need a rebuild. I’d like to buy an engine and do a rebuild in my free time and will eventually swap in when needed. My question is about interchange between years. Can I buy any Jeep 4.0 and rebuild the short block and just swap my accessories, head, etc. when the time comes? Is there one variant of 4.0 that would be better to look for? Thanks in advance!